prepping for v0.0.15

Author: Dougal Ballantyne

CHANGELOG.rst

@@ -5,9 +5,11 @@ CHANGELOG
 0.0.15
 ======
 
+* feature:``cfncluster``: Support for Frankfurt region
 * feature:``cli``: status call now outputs CREATE_FAILED messages for stacks in error state
 * update:``cli``: Improved tags and extra_parameters on CLI
 * bugfix:``cli``: Only check config sanity on calls that mutate stack
+* updates:``ami``: Pulled latest CentOS errata
 
 0.0.14
 ======

amis.txt

@@ -1,8 +1,10 @@
-us-west-2 ami-2199d511
-eu-west-1 ami-7eca6609
-sa-east-1 ami-91de6a8c
-us-east-1 ami-6e71c806
-ap-northeast-1 ami-299cab28
-us-west-1 ami-05848e40
-ap-southeast-1 ami-5cac8a0e
-ap-southeast-2 ami-9b6f02a1
+us-west-2 ami-ef632ddf
+eu-central-1 ami-1c132501
+sa-east-1 ami-d3d364ce
+ap-northeast-1 ami-2188bb20
+eu-west-1 ami-3470d943
+us-east-1 ami-f4ea6b9c
+us-west-1 ami-c30e1a86
+ap-southeast-2 ami-537e1269
+ap-southeast-1 ami-0c70505e
+us-gov-west-1 ami-8f1573ac

cli/cfncluster/cfnconfig.py

@@ -135,7 +135,10 @@ def __init__(self, args):
                     config_sanity.check_resource(self.region,self.aws_access_key_id, self.aws_secret_access_key,
                                              'URL', self.template_url)
             except ConfigParser.NoOptionError:
-                self.template_url = ('https://s3.amazonaws.com/cfncluster-%s/templates/cfncluster-%s.cfn.json' % (self.region, self.version))
+                if self.region == 'eu-central-1':
+                    self.template_url = ('https://s3.%s.amazonaws.com/cfncluster-%s/templates/cfncluster-%s.cfn.json' % (self.region, self.region, self.version))
+                else:
+                    self.template_url = ('https://s3-%s.amazonaws.com/cfncluster-%s/templates/cfncluster-%s.cfn.json' % (self.region, self.region, self.version))
         except AttributeError:
             pass
 

cli/cfncluster/examples/config

@@ -13,10 +13,11 @@ sanity_check = true
 # replace these with your AWS keys
 # If not defined, boto will attempt to use a) enviornment
 # or b) EC2 IAM role.
-#aws_access_key_id= #your_aws_access_key_id
+#aws_access_key_id = #your_aws_access_key_id
 #aws_secret_access_key = #your_secret_access_key
 # Uncomment to specify a different Amazon AWS region  (OPTIONAL)
-#aws_region_name = us-west-2
+# (Defaults to us-east-1 if not defined in enviornment or below)
+#aws_region_name = #region
 
 ## cfncluster templates
 [cluster default]

cli/setup.py

@@ -20,8 +20,8 @@ def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 console_scripts = ['cfncluster = cfncluster.cli:main']
-version = "0.0.99"
-requires = ['boto>=2.33', 'botocore'] 
+version = "0.0.15"
+requires = ['boto>=2.34'] 
 
 if sys.version_info[:2] == (2, 6):
     # For python2.6 we have to require argparse since it