Skip to content

Commit 91e345b

Browse files
dougalbdougalb
committed
Merge branch 'release-1.1.0'
2 parents d14a9fc + ff6481e commit 91e345b

File tree

9 files changed

+158
-103
lines changed

9 files changed

+158
-103
lines changed

‎CHANGELOG.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
CHANGELOG
33
=========
44

5+
1.1.0
6+
=====
7+
* feature:``cfncluster``: Support for dynamic placement groups
8+
9+
1.0.1
10+
=====
11+
* bugfix:``cfncluster-node``: Fix for nodes being disabled when maintain_initial_size is true
12+
513
1.0.0
614
=====
715
Offiical release of the CfnCluster 1.x CLI, templates and AMIs. Available in all regions except BJS, with

‎CONTRIBUTORS.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ List of contributors:
66
- Kenneth Daily - kmdaily at gmail dot com
77
- John Lilley - johnbot at ltech dot edu
88
- Nelson R Monserrate - MonserrateNelson at JohnDeere dot com
9-
- Karl Gutwin - https://github.com/kgutwin
9+
- Karl Gutwin - karl dot gutwin at biogen dot com
10+
- Josh Clausman - jclausman at semanticmachines dot com

‎amis.txt‎

Lines changed: 40 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,44 @@
11
# centos6
2-
ap-northeast-1: ami-37060159
3-
ap-northeast-2: ami-0e1ad460
4-
ap-southeast-1: ami-3a2ee059
5-
ap-southeast-2: ami-d91e39ba
6-
eu-central-1: ami-3fc4df53
7-
eu-west-1: ami-b9e95aca
8-
sa-east-1: ami-87890aeb
9-
us-east-1: ami-a22114c8
10-
us-west-1: ami-cdd4a2ad
11-
us-west-2: ami-46ec0c26
12-
us-gov-west-1: ami-1dc27e7c
2+
ap-northeast-1: ami-4540402b
3+
ap-northeast-2: ami-bb29e7d5
4+
ap-southeast-1: ami-00ce0763
5+
ap-southeast-2: ami-d17c5ab2
6+
eu-central-1: ami-e53d2789
7+
eu-west-1: ami-6aba0719
8+
sa-east-1: ami-192fac75
9+
us-east-1: ami-ac7343c6
10+
us-west-1: ami-3f8ffe5f
11+
us-west-2: ami-6c46a50c
1312
# centos7
14-
ap-northeast-1: ami-b40304da
15-
ap-northeast-2: ami-991fd1f7
16-
ap-southeast-1: ami-1b2ae478
17-
ap-southeast-2: ami-801c3be3
18-
eu-central-1: ami-e7fbe08b
19-
eu-west-1: ami-25d56656
20-
sa-east-1: ami-e48d0e88
21-
us-east-1: ami-682e1b02
22-
us-west-1: ami-1ad7a17a
23-
us-west-2: ami-04f11164
24-
us-gov-west-1: ami-3cbe025d
13+
ap-northeast-1: ami-2c424242
14+
ap-northeast-2: ami-df27e9b1
15+
ap-southeast-1: ami-4cc0092f
16+
ap-southeast-2: ami-b17b5dd2
17+
eu-central-1: ami-45302a29
18+
eu-west-1: ami-b5bb06c6
19+
sa-east-1: ami-162caf7a
20+
us-east-1: ami-d77343bd
21+
us-west-1: ami-128ffe72
22+
us-west-2: ami-5447a434
2523
# alinux
26-
ap-northeast-1: ami-5503043b
27-
ap-northeast-2: ami-591fd137
28-
ap-southeast-1: ami-b42ee0d7
29-
ap-southeast-2: ami-8a1c3be9
30-
eu-central-1: ami-79c4df15
31-
eu-west-1: ami-88d360fb
32-
sa-east-1: ami-af9211c3
33-
us-east-1: ami-0b2b1e61
34-
us-west-1: ami-3bd6a05b
35-
us-west-2: ami-31f01051
36-
us-gov-west-1: ami-6eb8040f
24+
ap-northeast-1: ami-824646ec
25+
ap-northeast-2: ami-ec2be582
26+
ap-southeast-1: ami-b0ce07d3
27+
ap-southeast-2: ami-cb7d5ba8
28+
eu-central-1: ami-a6302aca
29+
eu-west-1: ami-0ab70a79
30+
sa-east-1: ami-472caf2b
31+
us-east-1: ami-9c7646f6
32+
us-west-1: ami-898ffee9
33+
us-west-2: ami-b347a4d3
3734
# ubuntu1404
38-
ap-northeast-1: ami-ba0106d4
39-
ap-northeast-2: ami-581fd136
40-
ap-southeast-1: ami-832fe1e0
41-
ap-southeast-2: ami-ab1a3dc8
42-
eu-central-1: ami-17fbe07b
43-
eu-west-1: ami-c5d261b6
44-
sa-east-1: ami-998d0ef5
45-
us-east-1: ami-5114213b
46-
us-west-1: ami-3be99f5b
47-
us-west-2: ami-72f31312
48-
us-gov-west-1: ami-a0ba06c1
35+
ap-northeast-1: ami-5245453c
36+
ap-northeast-2: ami-5c2ae432
37+
ap-southeast-1: ami-cdc20bae
38+
ap-southeast-2: ami-f97b5d9a
39+
eu-central-1: ami-a8302ac4
40+
eu-west-1: ami-1cb70a6f
41+
sa-east-1: ami-1632b17a
42+
us-east-1: ami-f3764699
43+
us-west-1: ami-bf8effdf
44+
us-west-2: ami-534ba833

‎cli/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def read(fname):
2020
return open(os.path.join(os.path.dirname(__file__), fname)).read()
2121

2222
console_scripts = ['cfncluster = cfncluster.cli:main']
23-
version = "1.0.0"
23+
version = "1.1.0"
2424
requires = ['boto>=2.39']
2525

2626
if sys.version_info[:2] == (2, 6):

‎cloudformation/cfncluster.cfn.json‎

Lines changed: 89 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"AWSTemplateFormatVersion" : "2010-09-09",
3-
"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-201602120030 cfncluster-1.0.0",
3+
"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-201602192042 cfncluster-1.1.0",
44
"Parameters" : {
55
"KeyName" : {
66
"Description" : "Name of an existing EC2 KeyPair to enable SSH access to the instances",
@@ -804,6 +804,21 @@
804804
},
805805
"NONE"
806806
]
807+
},
808+
"CreatePlacementGroup" : {
809+
"Fn::And" : [
810+
{
811+
"Fn::Equals" : [
812+
{
813+
"Ref" : "PlacementGroup"
814+
},
815+
"DYNAMIC"
816+
]
817+
},
818+
{
819+
"Condition" : "UsePlacementGroup"
820+
}
821+
]
807822
}
808823
},
809824
"Mappings" : {
@@ -983,70 +998,70 @@
983998
},
984999
"AWSRegionOS2AMI" : {
9851000
"eu-west-1" : {
986-
"centos6" : "ami-b9e95aca",
987-
"centos7" : "ami-25d56656",
988-
"alinux" : "ami-88d360fb",
989-
"ubuntu1404" : "ami-c5d261b6"
1001+
"centos6" : "ami-6aba0719",
1002+
"centos7" : "ami-b5bb06c6",
1003+
"alinux" : "ami-0ab70a79",
1004+
"ubuntu1404" : "ami-1cb70a6f"
9901005
},
9911006
"us-west-2" : {
992-
"centos6" : "ami-46ec0c26",
993-
"centos7" : "ami-04f11164",
994-
"alinux" : "ami-31f01051",
995-
"ubuntu1404" : "ami-72f31312"
1007+
"centos6" : "ami-6c46a50c",
1008+
"centos7" : "ami-5447a434",
1009+
"alinux" : "ami-b347a4d3",
1010+
"ubuntu1404" : "ami-534ba833"
9961011
},
9971012
"eu-central-1" : {
998-
"centos6" : "ami-3fc4df53",
999-
"centos7" : "ami-e7fbe08b",
1000-
"alinux" : "ami-79c4df15",
1001-
"ubuntu1404" : "ami-17fbe07b"
1013+
"centos6" : "ami-e53d2789",
1014+
"centos7" : "ami-45302a29",
1015+
"alinux" : "ami-a6302aca",
1016+
"ubuntu1404" : "ami-a8302ac4"
10021017
},
10031018
"sa-east-1" : {
1004-
"centos6" : "ami-87890aeb",
1005-
"centos7" : "ami-e48d0e88",
1006-
"alinux" : "ami-af9211c3",
1007-
"ubuntu1404" : "ami-998d0ef5"
1019+
"centos6" : "ami-192fac75",
1020+
"centos7" : "ami-162caf7a",
1021+
"alinux" : "ami-472caf2b",
1022+
"ubuntu1404" : "ami-1632b17a"
10081023
},
10091024
"ap-northeast-1" : {
1010-
"centos6" : "ami-37060159",
1011-
"centos7" : "ami-b40304da",
1012-
"alinux" : "ami-5503043b",
1013-
"ubuntu1404" : "ami-ba0106d4"
1025+
"centos6" : "ami-4540402b",
1026+
"centos7" : "ami-2c424242",
1027+
"alinux" : "ami-824646ec",
1028+
"ubuntu1404" : "ami-5245453c"
10141029
},
10151030
"us-east-1" : {
1016-
"centos6" : "ami-a22114c8",
1017-
"centos7" : "ami-682e1b02",
1018-
"alinux" : "ami-0b2b1e61",
1019-
"ubuntu1404" : "ami-5114213b"
1031+
"centos6" : "ami-ac7343c6",
1032+
"centos7" : "ami-d77343bd",
1033+
"alinux" : "ami-9c7646f6",
1034+
"ubuntu1404" : "ami-f3764699"
10201035
},
10211036
"us-west-1" : {
1022-
"centos6" : "ami-cdd4a2ad",
1023-
"centos7" : "ami-1ad7a17a",
1024-
"alinux" : "ami-3bd6a05b",
1025-
"ubuntu1404" : "ami-3be99f5b"
1037+
"centos6" : "ami-3f8ffe5f",
1038+
"centos7" : "ami-128ffe72",
1039+
"alinux" : "ami-898ffee9",
1040+
"ubuntu1404" : "ami-bf8effdf"
10261041
},
10271042
"ap-southeast-2" : {
1028-
"centos6" : "ami-d91e39ba",
1029-
"centos7" : "ami-801c3be3",
1030-
"alinux" : "ami-8a1c3be9",
1031-
"ubuntu1404" : "ami-ab1a3dc8"
1043+
"centos6" : "ami-d17c5ab2",
1044+
"centos7" : "ami-b17b5dd2",
1045+
"alinux" : "ami-cb7d5ba8",
1046+
"ubuntu1404" : "ami-f97b5d9a"
10321047
},
10331048
"ap-southeast-1" : {
1034-
"centos6" : "ami-3a2ee059",
1035-
"centos7" : "ami-1b2ae478",
1036-
"alinux" : "ami-b42ee0d7",
1037-
"ubuntu1404" : "ami-832fe1e0"
1049+
"centos6" : "ami-00ce0763",
1050+
"centos7" : "ami-4cc0092f",
1051+
"alinux" : "ami-b0ce07d3",
1052+
"ubuntu1404" : "ami-cdc20bae"
10381053
},
10391054
"us-gov-west-1" : {
1040-
"centos6" : "ami-1dc27e7c",
1041-
"centos7" : "ami-3cbe025d",
1042-
"alinux" : "ami-6eb8040f",
1043-
"ubuntu1404" : "ami-a0ba06c1"
1055+
"centos6" : "NA",
1056+
"centos7" : "NA",
1057+
"alinux" : "NA",
1058+
"ubuntu1404" : "NA"
10441059
},
10451060
"ap-northeast-2" : {
1046-
"centos6" : "ami-0e1ad460",
1047-
"centos7" : "ami-991fd1f7",
1048-
"alinux" : "ami-591fd137",
1049-
"ubuntu1404" : "ami-581fd136"
1061+
"centos6" : "ami-bb29e7d5",
1062+
"centos7" : "ami-df27e9b1",
1063+
"alinux" : "ami-ec2be582",
1064+
"ubuntu1404" : "ami-5c2ae432"
10501065
}
10511066
},
10521067
"OSFeatures" : {
@@ -1069,12 +1084,12 @@
10691084
},
10701085
"CfnClusterVersions" : {
10711086
"default" : {
1072-
"cfncluster" : "cfncluster-1.0.0",
1087+
"cfncluster" : "cfncluster-1.1.0",
10731088
"cookbook" : "cfncluster-cookbook-1.0.0",
10741089
"chef" : "12.4.3",
10751090
"ridley" : "4.3.2",
10761091
"berkshelf" : "4.0.1",
1077-
"ami" : "201602120030"
1092+
"ami" : "201602192042"
10781093
}
10791094
},
10801095
"AWSRegion2Capabilites" : {
@@ -1635,7 +1650,15 @@
16351650
"Fn::If" : [
16361651
"UseClusterPlacement",
16371652
{
1638-
"Ref" : "PlacementGroup"
1653+
"Fn::If" : [
1654+
"CreatePlacementGroup",
1655+
{
1656+
"Ref" : "DynamicPlacementGroup"
1657+
},
1658+
{
1659+
"Ref" : "PlacementGroup"
1660+
}
1661+
]
16391662
},
16401663
{
16411664
"Ref" : "AWS::NoValue"
@@ -1952,7 +1975,7 @@
19521975
"command" : "touch /etc/chef/ohai/hints/ec2.json"
19531976
},
19541977
"jq" : {
1955-
"command" : "/usr/local/bin/jq --argfile f1 /tmp/dna.json --argfile f2 /tmp/extra.json -n '$f1 + $f2 | .cfncluster = $f1.cfncluster + $f2.cfncluster' > /etc/chef/dna.json || echo \"jq not installed\"; cp /tmp/dna.json /etc/chef/dna.json"
1978+
"command" : "/usr/local/bin/jq --argfile f1 /tmp/dna.json --argfile f2 /tmp/extra.json -n '$f1 + $f2 | .cfncluster = $f1.cfncluster + $f2.cfncluster' > /etc/chef/dna.json || ( echo \"jq not installed\"; cp /tmp/dna.json /etc/chef/dna.json )"
19561979
}
19571980
}
19581981
},
@@ -2079,7 +2102,15 @@
20792102
"Fn::If" : [
20802103
"UsePlacementGroup",
20812104
{
2082-
"Ref" : "PlacementGroup"
2105+
"Fn::If" : [
2106+
"CreatePlacementGroup",
2107+
{
2108+
"Ref" : "DynamicPlacementGroup"
2109+
},
2110+
{
2111+
"Ref" : "PlacementGroup"
2112+
}
2113+
]
20832114
},
20842115
{
20852116
"Ref" : "AWS::NoValue"
@@ -2613,7 +2644,7 @@
26132644
"command" : "touch /etc/chef/ohai/hints/ec2.json"
26142645
},
26152646
"jq" : {
2616-
"command" : "/usr/local/bin/jq --argfile f1 /tmp/dna.json --argfile f2 /tmp/extra.json -n '$f1 + $f2 | .cfncluster = $f1.cfncluster + $f2.cfncluster' > /etc/chef/dna.json || echo \"jq not installed\"; cp /tmp/dna.json /etc/chef/dna.json"
2647+
"command" : "/usr/local/bin/jq --argfile f1 /tmp/dna.json --argfile f2 /tmp/extra.json -n '$f1 + $f2 | .cfncluster = $f1.cfncluster + $f2.cfncluster' > /etc/chef/dna.json || ( echo \"jq not installed\"; cp /tmp/dna.json /etc/chef/dna.json )"
26172648
}
26182649
}
26192650
},
@@ -3038,6 +3069,13 @@
30383069
}
30393070
},
30403071
"Condition" : "MasterPublicIp"
3072+
},
3073+
"DynamicPlacementGroup" : {
3074+
"Type" : "AWS::EC2::PlacementGroup",
3075+
"Properties" : {
3076+
"Strategy" : "cluster"
3077+
},
3078+
"Condition" : "CreatePlacementGroup"
30413079
}
30423080
},
30433081
"Outputs" : {

‎docs/source/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
# The short X.Y version.
5353
version = '1.0'
5454
# The full version, including alpha/beta/rc tags.
55-
release = '1.0.0'
55+
release = '1.0.1'
5656

5757
# The language for content autogenerated by Sphinx. Refer to documentation
5858
# for a list of supported languages.

‎docs/source/configuration.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ Defaults to NONE for the default template. ::
227227

228228
placement_group
229229
"""""""""""""""
230-
Cluster placement group. This placement group must already exist.
230+
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.
231231

232232
Defaults to NONE for the default template. ::
233233

0 commit comments

Comments
 (0)