Merge 1.4.1 release into master

Author: bwbarrett

cli/cfncluster/cfncluster.py

@@ -24,12 +24,13 @@
 
 from . import cfnconfig
 
+logger = logging.getLogger('cfncluster.cfncluster')
+
 def version(args):
     config = cfnconfig.CfnClusterConfig(args)
     print(config.version)
 
 def create(args):
-    logger = logging.getLogger('cfncluster.cfncluster.create')
     logger.info('Beginning cluster creation for cluster: %s' % (args.cluster_name))
 
     logger.debug('Building cluster config based on args')
@@ -79,7 +80,6 @@ def create(args):
         stack = cfnconn.create_stack(stack_name,template_url=config.template_url,
                                      parameters=config.parameters, capabilities=capabilities,
                                      disable_rollback=args.norollback, tags=config.tags)
-        logger.info("foo")
         status = cfnconn.describe_stacks(stack)[0].stack_status
 
 

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 = "1.4.0"
+version = "1.4.1"
 requires = ['boto>=2.48.0', 'awscli>=1.11.175', 'future>=0.16.0']
 
 if sys.version_info[:2] == (2, 6):

cloudformation/cfncluster.cfn.json

@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion" : "2010-09-09",
-  "Description" : "AWS CloudFormation Sample Template cfncluster.cfn.json: Sample template showing an framework for deploying master + compute type clusters on AWS.  **WARNING** This template creates AWS resources. You will be billed for the AWS resources used if you create a stack from this template. Version: ami-201609030709 cfncluster-1.4.0",
+  "Description" : "AWS CloudFormation Sample Template cfncluster.cfn.json: Sample template showing an framework for deploying master + compute type clusters on AWS.  **WARNING** This template creates AWS resources. You will be billed for the AWS resources used if you create a stack from this template. Version: ami-201609030709 cfncluster-1.4.1",
   "Metadata" : {
     "AWS::CloudFormation::Interface" : {
       "ParameterGroups" : [
@@ -1760,7 +1760,7 @@
     },
     "CfnClusterVersions" : {
       "default" : {
-        "cfncluster" : "cfncluster-1.4.0",
+        "cfncluster" : "cfncluster-1.4.1",
         "cookbook" : "cfncluster-cookbook-1.4.0",
         "chef" : "12.19.36",
         "ridley" : "5.1.0",

cloudformation/cfncluster.cfn.yaml

@@ -2,7 +2,7 @@ AWSTemplateFormatVersion: '2010-09-09'
 Description: 'AWS CloudFormation Sample Template cfncluster.cfn.json: Sample template
   showing an framework for deploying master + compute type clusters on AWS.  **WARNING**
   This template creates AWS resources. You will be billed for the AWS resources used
-  if you create a stack from this template. Version: ami-201609030709 cfncluster-1.4.0'
+  if you create a stack from this template. Version: ami-201609030709 cfncluster-1.4.1'
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:
@@ -980,7 +980,7 @@ Mappings:
       RootDevice: /dev/sda1
   CfnClusterVersions:
     default:
-      cfncluster: cfncluster-1.4.0
+      cfncluster: cfncluster-1.4.1
       cookbook: cfncluster-cookbook-1.4.0
       chef: 12.19.36
       ridley: 5.1.0

docs/source/conf.py

@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.4'
 # The full version, including alpha/beta/rc tags.
-release = '1.4.0'
+release = '1.4.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.