Skip to content

Commit 221d4e3

Browse files
committed
Prepping for 1.2.0 release.
1 parent fcd61f1 commit 221d4e3

File tree

3 files changed

+57
-49
lines changed

3 files changed

+57
-49
lines changed

CHANGELOG.rst

+8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
CHANGELOG
33
=========
44

5+
1.2.0
6+
=====
7+
* bugfix:``cfncluster-node``: Correctly set slots per host for Openlava
8+
* updates:``cfncluster-cookbook``: Updated to cfncluster-cookbook-1.2.0
9+
* updates:``ami``: Updated to SGE 8.1.9
10+
* updates:``ami``: Updated to Openlava 3.1.3
11+
* updates:``ami``: Updated to Chef 12.8.1
12+
513
1.1.0
614
=====
715
* feature:``cfncluster``: Support for dynamic placement groups

cli/setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ 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.1.1"
24-
requires = ['boto>=2.39']
23+
version = "1.2.0"
24+
requires = ['boto>=2.39', 'awscli>=1.10.13']
2525

2626
if sys.version_info[:2] == (2, 6):
2727
# For python2.6 we have to require argparse since it

cloudformation/cfncluster.cfn.json

+47-47
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-201602192042 cfncluster-1.1.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-201603212132 cfncluster-1.2.0",
44
"Parameters" : {
55
"KeyName" : {
66
"Description" : "Name of an existing EC2 KeyPair to enable SSH access to the instances",
@@ -998,58 +998,58 @@
998998
},
999999
"AWSRegionOS2AMI" : {
10001000
"eu-west-1" : {
1001-
"centos6" : "ami-6aba0719",
1002-
"centos7" : "ami-b5bb06c6",
1003-
"alinux" : "ami-0ab70a79",
1004-
"ubuntu1404" : "ami-1cb70a6f"
1001+
"centos6" : "",
1002+
"centos7" : "",
1003+
"alinux" : "",
1004+
"ubuntu1404" : ""
10051005
},
10061006
"us-west-2" : {
1007-
"centos6" : "ami-6c46a50c",
1008-
"centos7" : "ami-5447a434",
1009-
"alinux" : "ami-b347a4d3",
1010-
"ubuntu1404" : "ami-534ba833"
1007+
"centos6" : "ami-e60ee686",
1008+
"centos7" : "ami-920be3f2",
1009+
"alinux" : "ami-d10ae2b1",
1010+
"ubuntu1404" : "ami-200ee640"
10111011
},
10121012
"eu-central-1" : {
1013-
"centos6" : "ami-e53d2789",
1014-
"centos7" : "ami-45302a29",
1015-
"alinux" : "ami-a6302aca",
1016-
"ubuntu1404" : "ami-a8302ac4"
1013+
"centos6" : "",
1014+
"centos7" : "",
1015+
"alinux" : "",
1016+
"ubuntu1404" : ""
10171017
},
10181018
"sa-east-1" : {
1019-
"centos6" : "ami-192fac75",
1020-
"centos7" : "ami-162caf7a",
1021-
"alinux" : "ami-472caf2b",
1022-
"ubuntu1404" : "ami-1632b17a"
1019+
"centos6" : "",
1020+
"centos7" : "",
1021+
"alinux" : "",
1022+
"ubuntu1404" : ""
10231023
},
10241024
"ap-northeast-1" : {
1025-
"centos6" : "ami-4540402b",
1026-
"centos7" : "ami-2c424242",
1027-
"alinux" : "ami-824646ec",
1028-
"ubuntu1404" : "ami-5245453c"
1025+
"centos6" : "",
1026+
"centos7" : "",
1027+
"alinux" : "",
1028+
"ubuntu1404" : ""
10291029
},
10301030
"us-east-1" : {
1031-
"centos6" : "ami-ac7343c6",
1032-
"centos7" : "ami-d77343bd",
1033-
"alinux" : "ami-9c7646f6",
1034-
"ubuntu1404" : "ami-f3764699"
1031+
"centos6" : "",
1032+
"centos7" : "",
1033+
"alinux" : "",
1034+
"ubuntu1404" : ""
10351035
},
10361036
"us-west-1" : {
1037-
"centos6" : "ami-3f8ffe5f",
1038-
"centos7" : "ami-128ffe72",
1039-
"alinux" : "ami-898ffee9",
1040-
"ubuntu1404" : "ami-bf8effdf"
1037+
"centos6" : "",
1038+
"centos7" : "",
1039+
"alinux" : "",
1040+
"ubuntu1404" : ""
10411041
},
10421042
"ap-southeast-2" : {
1043-
"centos6" : "ami-d17c5ab2",
1044-
"centos7" : "ami-b17b5dd2",
1045-
"alinux" : "ami-cb7d5ba8",
1046-
"ubuntu1404" : "ami-f97b5d9a"
1043+
"centos6" : "",
1044+
"centos7" : "",
1045+
"alinux" : "",
1046+
"ubuntu1404" : ""
10471047
},
10481048
"ap-southeast-1" : {
1049-
"centos6" : "ami-00ce0763",
1050-
"centos7" : "ami-4cc0092f",
1051-
"alinux" : "ami-b0ce07d3",
1052-
"ubuntu1404" : "ami-cdc20bae"
1049+
"centos6" : "",
1050+
"centos7" : "",
1051+
"alinux" : "",
1052+
"ubuntu1404" : ""
10531053
},
10541054
"us-gov-west-1" : {
10551055
"centos6" : "NA",
@@ -1058,10 +1058,10 @@
10581058
"ubuntu1404" : "NA"
10591059
},
10601060
"ap-northeast-2" : {
1061-
"centos6" : "ami-bb29e7d5",
1062-
"centos7" : "ami-df27e9b1",
1063-
"alinux" : "ami-ec2be582",
1064-
"ubuntu1404" : "ami-5c2ae432"
1061+
"centos6" : "",
1062+
"centos7" : "",
1063+
"alinux" : "",
1064+
"ubuntu1404" : ""
10651065
}
10661066
},
10671067
"OSFeatures" : {
@@ -1084,12 +1084,12 @@
10841084
},
10851085
"CfnClusterVersions" : {
10861086
"default" : {
1087-
"cfncluster" : "cfncluster-1.1.0",
1088-
"cookbook" : "cfncluster-cookbook-1.1.0",
1089-
"chef" : "12.4.3",
1090-
"ridley" : "4.3.2",
1091-
"berkshelf" : "4.0.1",
1092-
"ami" : "201602192042"
1087+
"cfncluster" : "cfncluster-1.2.0",
1088+
"cookbook" : "cfncluster-cookbook-1.2.0",
1089+
"chef" : "12.8.1",
1090+
"ridley" : "4.5.0",
1091+
"berkshelf" : "4.3.0",
1092+
"ami" : "201603212132"
10931093
}
10941094
},
10951095
"AWSRegion2Capabilites" : {

0 commit comments

Comments
 (0)