Updated template and improved region handling.

Author: Dougal Ballantyne

cli/cfncluster/cfncluster.py

@@ -32,14 +32,15 @@ def create(args):
         config.parameters.append(('ComputeWaitConditionCount', initial_queue_size))
     except ValueError:
         pass
+
     capabilities = ["CAPABILITY_IAM"]
     cfnconn = boto.cloudformation.connect_to_region(config.region,aws_access_key_id=config.aws_access_key_id,
                                                     aws_secret_access_key=config.aws_secret_access_key)
     try:
         logger.debug((config.template_url, config.parameters))
         stack = cfnconn.create_stack(('cfncluster-' + args.cluster_name),template_url=config.template_url,
                                      parameters=config.parameters, capabilities=capabilities,
-                                     disable_rollback=args.norollback)
+                                     disable_rollback=args.norollback, tags=args.tags)
         status = cfnconn.describe_stacks(stack)[0].stack_status
         if not args.nowait:
             while status == 'CREATE_IN_PROGRESS':

cli/cfncluster/cfnconfig.py

@@ -94,14 +94,17 @@ def __init__(self, args):
             raise Exception
 
         # Determine the EC2 region to used used or default to us-east-1
-        # Order is 1) CLI arg 2) Config file 3) us-east-1
+        # Order is 1) CLI arg 2) AWS_DEFAULT_REGION env 3) Config file 4) us-east-1
         if args.region:
             self.region = args.region
         else:
-            try:
-                self.region = __config.get('aws', 'aws_region_name')
-            except ConfigParser.NoOptionError:
-                self.region = 'us-east-1'
+            if os.environ.get('AWS_DEFAULT_REGION'):
+                self.region = os.environ.get('AWS_DEFAULT_REGION')
+            else:
+                try:
+                    self.region = __config.get('aws', 'aws_region_name')
+                except ConfigParser.NoOptionError:
+                    self.region = 'us-east-1'
 
         # Check if credentials have been provided in config
         try:

cli/cfncluster/cli.py

@@ -58,7 +58,7 @@ def main():
     # add the handler to the root logger
     logging.getLogger('cfncluster.cli').addHandler(console)
 
-    parser = argparse.ArgumentParser(description='cfncluster is the a tool to launch and manage cluster.')
+    parser = argparse.ArgumentParser(description='cfncluster is a tool to launch and manage a cluster.')
     parser.add_argument("--config", "-c", dest="config_file", help='specify a alternative config file')
     parser.add_argument( "--region", "-r", dest="region", help='specify a specific region to connect to',
                         default=None)

cli/setup.py

@@ -9,7 +9,7 @@
 # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
+import os, sys
 from setuptools import setup, find_packages
 
 # Utility function to read the README file.
@@ -20,7 +20,13 @@ def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 console_scripts = ['cfncluster = cfncluster.cli:main']
-version = "0.0.9"
+version = "0.0.10"
+requires = ['boto', 'botocore'] 
+
+if sys.version_info[:2] == (2, 6):
+    # For python2.6 we have to require argparse since it
+    # was not in stdlib until 2.7.
+    requires.append('argparse>=1.1')
 
 setup(
     name = "cfncluster",
@@ -31,7 +37,7 @@ def read(fname):
     url = ("https://github.com/awslabs/cfncluster"),
     license = "Amazon Software License",
     packages = find_packages(),
-    install_requires=['boto', 'argparse'],
+    install_requires = requires,
     entry_points=dict(console_scripts=console_scripts),
     include_package_data = True,
     zip_safe = False,

cloudformation/cfncluster.cfn.json

@@ -588,28 +588,28 @@
     },
     "AWSRegionArch2AMI" : {
       "eu-west-1" : {
-        "64HVM" : "ami-7df5220a"
+        "64HVM" : "ami-b04290c7"
       },
       "us-east-1" : {
-        "64HVM" : "ami-0c458764"
+        "64HVM" : "ami-208a5b48"
       },
       "ap-northeast-1" : {
-        "64HVM" : "ami-4f38684e"
+        "64HVM" : "ami-75411874"
       },
       "us-west-2" : {
-        "64HVM" : "ami-750f7645"
+        "64HVM" : "ami-ed5822dd"
       },
       "sa-east-1" : {
-        "64HVM" : "ami-7753fd6a"
+        "64HVM" : "ami-fde54de0"
       },
       "us-west-1" : {
-        "64HVM" : "ami-1b8c8c5e"
+        "64HVM" : "ami-1b78755e"
       },
       "ap-southeast-1" : {
-        "64HVM" : "ami-da4e1788"
+        "64HVM" : "ami-220e5570"
       },
       "ap-southeast-2" : {
-        "64HVM" : "ami-e5a9cedf"
+        "64HVM" : "ami-c181e7fb"
       }
     }
   },