Merge branch 'dynamic-placement-groups' into develop

Author: dougalb

CHANGELOG.rst

@@ -2,6 +2,10 @@
 CHANGELOG
 =========
 
+1.1.0
+=====
+* feature:``cfncluster``: Support for dynamic placement groups
+
 1.0.1
 =====
 * bugfix:``cfncluster-node``: Fix for nodes being disabled when maintain_initial_size is true

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.0.1"
+version = "1.1.0"
 requires = ['boto>=2.39'] 
 
 if sys.version_info[:2] == (2, 6):

cloudformation/cfncluster.cfn.json

@@ -804,6 +804,21 @@
         },
         "NONE"
       ]
+    },
+    "CreatePlacementGroup" : {
+      "Fn::And" : [
+        {
+          "Fn::Equals" : [
+            {
+              "Ref" : "PlacementGroup"
+            },
+            "DYNAMIC"
+          ]
+        },
+        {
+          "Condition" : "UsePlacementGroup"
+        }
+      ]
     }
   },
   "Mappings" : {
@@ -1635,7 +1650,15 @@
           "Fn::If" : [
             "UseClusterPlacement",
             {
-              "Ref" : "PlacementGroup"
+              "Fn::If" : [
+                "CreatePlacementGroup",
+                {
+                  "Ref" : "DynamicPlacementGroup"
+                },
+                {
+                  "Ref" : "PlacementGroup"
+                }
+              ]
             },
             {
               "Ref" : "AWS::NoValue"
@@ -2079,7 +2102,15 @@
           "Fn::If" : [
             "UsePlacementGroup",
             {
-              "Ref" : "PlacementGroup"
+              "Fn::If" : [
+                "CreatePlacementGroup",
+                {
+                  "Ref" : "DynamicPlacementGroup"
+                },
+                {
+                  "Ref" : "PlacementGroup"
+                }
+              ]
             },
             {
               "Ref" : "AWS::NoValue"
@@ -3038,6 +3069,13 @@
         }
       },
       "Condition" : "MasterPublicIp"
+    },
+    "DynamicPlacementGroup" : {
+      "Type" : "AWS::EC2::PlacementGroup",
+      "Properties" : {
+        "Strategy" : "cluster"
+      },
+      "Condition" : "CreatePlacementGroup"
     }
   },
   "Outputs" : {

docs/source/configuration.rst

@@ -227,7 +227,7 @@ Defaults to NONE for the default template. ::
 
 placement_group
 """""""""""""""
-Cluster placement group. This placement group must already exist.
+Cluster placement group. The can be one of three values: NONE, DYNAMIC and an existing placement group name. When DYNAMIC is set, a unique placement group will be created as part of the cluster and deleted when the cluster is deleted. 
 
 Defaults to NONE for the default template. ::