Merge pull request #12 from awslabs/develop

Pull release 0.0.11 from develop

Author: dougalb

CHANGELOG.rst

@@ -2,6 +2,13 @@
 CHANGELOG
 =========
 
+0.0.11
+======
+
+* updates:``ami``: Pulled latest CentOS errata
+* updates:``ami``: Removed DKMS Lustre; replaced with Intel Lustre Client
+
+
 0.0.10
 ======
 

amis.txt

@@ -1,8 +1,8 @@
-us-west-2 ami-ed5822dd
-eu-west-1 ami-b04290c7
-sa-east-1 ami-fde54de0
-us-east-1 ami-208a5b48
-ap-northeast-1 ami-75411874
-us-west-1 ami-1b78755e
-ap-southeast-1 ami-220e5570
-ap-southeast-2 ami-c181e7fb
+us-west-2 ami-7f8ece4f
+eu-west-1 ami-22953255
+sa-east-1 ami-2962c834
+us-east-1 ami-1a69c072
+ap-northeast-1 ami-8f012e8e
+us-west-1 ami-79afa63c
+ap-southeast-1 ami-44ecc816
+ap-southeast-2 ami-814526bb

bootstrap/src/scripts/boot_as_compute

@@ -19,6 +19,9 @@ set -x
 # Source functions
 . /opt/cfncluster/scripts/functions.shlib
 
+# Check DNS
+check_dns || error_exit "DNS checks failed."
+
 # Run preinstall script if defined
 run_preinstall
 

bootstrap/src/scripts/boot_as_master

@@ -19,6 +19,9 @@ set -x
 # Source functions
 . /opt/cfncluster/scripts/functions.shlib
 
+# Check DNS
+check_dns || error_exit "DNS checks failed."
+
 # Run preinstall script if defined
 run_preinstall
 

bootstrap/src/scripts/functions.shlib

@@ -15,6 +15,22 @@ function error_exit () {
   exit 1
 }
 
+# Check DNS is working, as it is required for correct operation
+function check_dns () {
+  TRY=0
+  while [ $TRY -lt 3 ]; do
+    hostname -f >/dev/null
+    check_fqdn=$?
+    if [ $check_fqdn -eq 0 ]; then
+      break
+    else
+      sleep 10
+      TRY=$(( $TRY + 1 ))
+    fi
+  done
+  return $check_fqdn
+}
+
 # Check and run preinstall
 function run_preinstall () {
   RC=0

cli/setup.py

@@ -20,7 +20,7 @@ def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 console_scripts = ['cfncluster = cfncluster.cli:main']
-version = "0.0.10"
+version = "0.0.11"
 requires = ['boto', 'botocore'] 
 
 if sys.version_info[:2] == (2, 6):

cloudformation/cfncluster.cfn.json

@@ -111,9 +111,7 @@
       "AllowedValues" : [
         "sge",
         "openlava",
-        "slurm",
         "torque",
-        "hadoop2",
         "test"
       ]
     },
@@ -588,28 +586,28 @@
     },
     "AWSRegionArch2AMI" : {
       "eu-west-1" : {
-        "64HVM" : "ami-b04290c7"
+        "64HVM" : "ami-22953255"
       },
       "us-east-1" : {
-        "64HVM" : "ami-208a5b48"
+        "64HVM" : "ami-1a69c072"
       },
       "ap-northeast-1" : {
-        "64HVM" : "ami-75411874"
+        "64HVM" : "ami-8f012e8e"
       },
       "us-west-2" : {
-        "64HVM" : "ami-ed5822dd"
+        "64HVM" : "ami-7f8ece4f"
       },
       "sa-east-1" : {
-        "64HVM" : "ami-fde54de0"
+        "64HVM" : "ami-2962c834"
       },
       "us-west-1" : {
-        "64HVM" : "ami-1b78755e"
+        "64HVM" : "ami-79afa63c"
       },
       "ap-southeast-1" : {
-        "64HVM" : "ami-220e5570"
+        "64HVM" : "ami-44ecc816"
       },
       "ap-southeast-2" : {
-        "64HVM" : "ami-c181e7fb"
+        "64HVM" : "ami-814526bb"
       }
     }
   },