Merge branch 'master' of github.com:awslabs/cfncluster

Author: Dougal Ballantyne

CHANGELOG.rst

@@ -2,19 +2,21 @@
 CHANGELOG
 =========
 
+0.0.13
+======
+* bugfix:``cli``: Fixed missing AvailabilityZone for "update" command
+
 0.0.12
 ======
 
 * updates:``cli``: Simplfied VPC config and removed multi-AZ
 
-
 0.0.11
 ======
 
 * updates:``ami``: Pulled latest CentOS errata
 * updates:``ami``: Removed DKMS Lustre; replaced with Intel Lustre Client
 
-
 0.0.10
 ======
 

README.md

@@ -8,7 +8,7 @@ everything is done using CloudFormation or resources within AWS.
 
 ### Installation
 
-The current working version is cfncluster-0.0.12. The CLI is written in python and uses BOTO for AWS actions. You can install the CLI with the following command:
+The current working version is cfncluster-0.0.13. The CLI is written in python and uses BOTO for AWS actions. You can install the CLI with the following command:
 
 #### Linux/OSX
 

cli/cfncluster/cfncluster.py

@@ -105,6 +105,21 @@ def update(args):
         desired_capacity = asgconn.get_all_groups(names=[asg])[0].desired_capacity
         config.parameters.append(('InitialQueueSize', desired_capacity))
 
+    # Get the MasterSubnetId and use it to determine AvailabilityZone
+    try:
+        i = [p[0] for p in config.parameters].index('MasterSubnetId')
+        master_subnet_id = config.parameters[i][1]
+        try:
+            vpcconn = boto.vpc.connect_to_region(config.region,aws_access_key_id=config.aws_access_key_id,
+                                                 aws_secret_access_key=config.aws_secret_access_key)
+            availability_zone = str(vpcconn.get_all_subnets(subnet_ids=master_subnet_id)[0].availability_zone)
+        except boto.exception.BotoServerError as e:
+            print e.message
+            sys.exit(1)
+        config.parameters.append(('AvailabilityZone', availability_zone))
+    except ValueError:
+        pass
+
     try:
         logger.debug((config.template_url, config.parameters))
         stack = cfnconn.update_stack(stack_name,template_url=config.template_url,

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.12"
+version = "0.0.13"
 requires = ['boto>=2.32.1', 'botocore'] 
 
 if sys.version_info[:2] == (2, 6):