Skip to content

Commit 477a5ea

Browse files
dougalbdougalb
committed
Final bits for the 1.0.0 release
1 parent f2e24d7 commit 477a5ea

File tree

4 files changed

+104
-92
lines changed

4 files changed

+104
-92
lines changed

‎CHANGELOG.rst‎

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

5+
1.0.0
6+
=====
7+
Offiical release of the CfnCluster 1.x CLI, templates and AMIs. Available in all regions except BJS, with
8+
support for Amazon Linux, CentOS 6 & 7 and Ubuntu 14.04 LTS. All AMIs are built via packer from the CfnCluster
9+
Cookbook project (https://github.com/awslabs/cfncluster-cookbook).
10+
511
1.0.0-beta
612
==========
713

‎amis.txt‎

Lines changed: 44 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,48 @@
11
# centos6
2-
ap-northeast-1: ami-e19da68f
3-
ap-northeast-2: ami-c4f03eaa
4-
ap-southeast-1: ami-2e5e914d
5-
ap-southeast-2: ami-8fd4f0ec
6-
eu-central-1: ami-71c0d81d
7-
eu-west-1: ami-a1bb0dd2
8-
sa-east-1: ami-1614947a
9-
us-east-1: ami-29567943
10-
us-west-1: ami-74304614
11-
us-west-2: ami-839375e3
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
1213
# centos7
13-
ap-northeast-1: ami-dd97acb3
14-
ap-northeast-2: ami-b5f739db
15-
ap-southeast-1: ami-af5d92cc
16-
ap-southeast-2: ami-84d5f1e7
17-
eu-central-1: ami-adc4dcc1
18-
eu-west-1: ami-0db90f7e
19-
sa-east-1: ami-0216966e
20-
us-east-1: ami-e0537c8a
21-
us-west-1: ami-7e31471e
22-
us-west-2: ami-ea90768a
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
2325
# alinux
24-
ap-northeast-1: ami-4b89b225
25-
ap-northeast-2: ami-c3f53bad
26-
ap-southeast-1: ami-bd5d92de
27-
ap-southeast-2: ami-c8d5f1ab
28-
eu-central-1: ami-88c3dbe4
29-
eu-west-1: ami-cfbd0bbc
30-
sa-east-1: ami-65139309
31-
us-east-1: ami-d4537cbe
32-
us-west-1: ami-35304655
33-
us-west-2: ami-529f7932
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
3437
# ubuntu1404
35-
ap-northeast-1: ami-fd83b893
36-
ap-northeast-2: ami-27f63849
37-
ap-southeast-1: ami-6e5b940d
38-
ap-southeast-2: ami-6cd7f30f
39-
eu-central-1: ami-b1c5dddd
40-
eu-west-1: ami-7cbb0d0f
41-
sa-east-1: ami-1613937a
42-
us-east-1: ami-2a2e0140
43-
us-west-1: ami-10304670
44-
us-west-2: ami-fe9a7c9e
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

‎cli/setup.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2013-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1+
# Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
#
33
# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the
44
# License. A copy of the License is located at
@@ -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.0.0b3"
24-
requires = ['boto>=2.38']
23+
version = "1.0.0"
24+
requires = ['boto>=2.39']
2525

2626
if sys.version_info[:2] == (2, 6):
2727
# For python2.6 we have to require argparse since it
@@ -46,7 +46,7 @@ def read(fname):
4646
},
4747
long_description=read('README'),
4848
classifiers=[
49-
"Development Status :: 4 - Beta",
49+
"Development Status :: 5 - Production/Stable",
5050
"Environment :: Console",
5151
"Programming Language :: Python",
5252
"Topic :: Scientific/Engineering",

‎cloudformation/cfncluster.cfn.json‎

Lines changed: 50 additions & 48 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-201602011823 cfncluster-1.0.0b3",
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",
44
"Parameters" : {
55
"KeyName" : {
66
"Description" : "Name of an existing EC2 KeyPair to enable SSH access to the instances",
@@ -983,70 +983,70 @@
983983
},
984984
"AWSRegionOS2AMI" : {
985985
"eu-west-1" : {
986-
"centos6" : "ami-a1bb0dd2",
987-
"centos7" : "ami-0db90f7e",
988-
"alinux" : "ami-cfbd0bbc",
989-
"ubuntu1404" : "ami-7cbb0d0f"
986+
"centos6" : "ami-b9e95aca",
987+
"centos7" : "ami-25d56656",
988+
"alinux" : "ami-88d360fb",
989+
"ubuntu1404" : "ami-c5d261b6"
990990
},
991991
"us-west-2" : {
992-
"centos6" : "ami-839375e3",
993-
"centos7" : "ami-ea90768a",
994-
"alinux" : "ami-529f7932",
995-
"ubuntu1404" : "ami-fe9a7c9e"
992+
"centos6" : "ami-46ec0c26",
993+
"centos7" : "ami-04f11164",
994+
"alinux" : "ami-31f01051",
995+
"ubuntu1404" : "ami-72f31312"
996996
},
997997
"eu-central-1" : {
998-
"centos6" : "ami-71c0d81d",
999-
"centos7" : "ami-adc4dcc1",
1000-
"alinux" : "ami-88c3dbe4",
1001-
"ubuntu1404" : "ami-b1c5dddd"
998+
"centos6" : "ami-3fc4df53",
999+
"centos7" : "ami-e7fbe08b",
1000+
"alinux" : "ami-79c4df15",
1001+
"ubuntu1404" : "ami-17fbe07b"
10021002
},
10031003
"sa-east-1" : {
1004-
"centos6" : "ami-1614947a",
1005-
"centos7" : "ami-0216966e",
1006-
"alinux" : "ami-65139309",
1007-
"ubuntu1404" : "ami-1613937a"
1004+
"centos6" : "ami-87890aeb",
1005+
"centos7" : "ami-e48d0e88",
1006+
"alinux" : "ami-af9211c3",
1007+
"ubuntu1404" : "ami-998d0ef5"
10081008
},
10091009
"ap-northeast-1" : {
1010-
"centos6" : "ami-e19da68f",
1011-
"centos7" : "ami-dd97acb3",
1012-
"alinux" : "ami-4b89b225",
1013-
"ubuntu1404" : "ami-fd83b893"
1010+
"centos6" : "ami-37060159",
1011+
"centos7" : "ami-b40304da",
1012+
"alinux" : "ami-5503043b",
1013+
"ubuntu1404" : "ami-ba0106d4"
10141014
},
10151015
"us-east-1" : {
1016-
"centos6" : "ami-29567943",
1017-
"centos7" : "ami-e0537c8a",
1018-
"alinux" : "ami-d4537cbe",
1019-
"ubuntu1404" : "ami-2a2e0140"
1016+
"centos6" : "ami-a22114c8",
1017+
"centos7" : "ami-682e1b02",
1018+
"alinux" : "ami-0b2b1e61",
1019+
"ubuntu1404" : "ami-5114213b"
10201020
},
10211021
"us-west-1" : {
1022-
"centos6" : "ami-74304614",
1023-
"centos7" : "ami-7e31471e",
1024-
"alinux" : "ami-35304655",
1025-
"ubuntu1404" : "ami-10304670"
1022+
"centos6" : "ami-cdd4a2ad",
1023+
"centos7" : "ami-1ad7a17a",
1024+
"alinux" : "ami-3bd6a05b",
1025+
"ubuntu1404" : "ami-3be99f5b"
10261026
},
10271027
"ap-southeast-2" : {
1028-
"centos6" : "ami-8fd4f0ec",
1029-
"centos7" : "ami-84d5f1e7",
1030-
"alinux" : "ami-c8d5f1ab",
1031-
"ubuntu1404" : "ami-6cd7f30f"
1028+
"centos6" : "ami-d91e39ba",
1029+
"centos7" : "ami-801c3be3",
1030+
"alinux" : "ami-8a1c3be9",
1031+
"ubuntu1404" : "ami-ab1a3dc8"
10321032
},
10331033
"ap-southeast-1" : {
1034-
"centos6" : "ami-2e5e914d",
1035-
"centos7" : "ami-af5d92cc",
1036-
"alinux" : "ami-bd5d92de",
1037-
"ubuntu1404" : "ami-6e5b940d"
1034+
"centos6" : "ami-3a2ee059",
1035+
"centos7" : "ami-1b2ae478",
1036+
"alinux" : "ami-b42ee0d7",
1037+
"ubuntu1404" : "ami-832fe1e0"
10381038
},
10391039
"us-gov-west-1" : {
1040-
"centos6" : "NA",
1041-
"centos7" : "NA",
1042-
"alinux" : "NA",
1043-
"ubuntu1404" : "NA"
1040+
"centos6" : "ami-1dc27e7c",
1041+
"centos7" : "ami-3cbe025d",
1042+
"alinux" : "ami-6eb8040f",
1043+
"ubuntu1404" : "ami-a0ba06c1"
10441044
},
10451045
"ap-northeast-2" : {
1046-
"centos6" : "ami-c4f03eaa",
1047-
"centos7" : "ami-b5f739db",
1048-
"alinux" : "ami-c3f53bad",
1049-
"ubuntu1404" : "ami-27f63849"
1046+
"centos6" : "ami-0e1ad460",
1047+
"centos7" : "ami-991fd1f7",
1048+
"alinux" : "ami-591fd137",
1049+
"ubuntu1404" : "ami-581fd136"
10501050
}
10511051
},
10521052
"OSFeatures" : {
@@ -1069,12 +1069,12 @@
10691069
},
10701070
"CfnClusterVersions" : {
10711071
"default" : {
1072-
"cfncluster" : "cfncluster-1.0.0b3",
1073-
"cookbook" : "cfncluster-cookbook-0.4.0",
1072+
"cfncluster" : "cfncluster-1.0.0",
1073+
"cookbook" : "cfncluster-cookbook-1.0.0",
10741074
"chef" : "12.4.3",
10751075
"ridley" : "4.3.2",
10761076
"berkshelf" : "4.0.1",
1077-
"ami" : "201602011823"
1077+
"ami" : "201602120030"
10781078
}
10791079
},
10801080
"AWSRegion2Capabilites" : {
@@ -1695,6 +1695,7 @@
16951695
" proxy_host=$(echo \"$proxy\" | awk -F/ '{print $3}' | cut -d: -f1)\n",
16961696
" proxy_port=$(echo \"$proxy\" | awk -F/ '{print $3}' | cut -d: -f2)\n",
16971697
" export http_proxy=$proxy; export https_proxy=$http_proxy\n",
1698+
" export HTTP_PROXY=$proxy; export HTTPS_PROXY=$http_proxy\n",
16981699
" echo -e \"[Boto]\nproxy = ${proxy_host}\nproxy_port = ${proxy_port}\n\" >/etc/boto.cfg\n",
16991700
"else\n",
17001701
" proxy_args=\"\"\n",
@@ -2365,6 +2366,7 @@
23652366
" proxy_host=$(echo \"$proxy\" | awk -F/ '{print $3}' | cut -d: -f1)\n",
23662367
" proxy_port=$(echo \"$proxy\" | awk -F/ '{print $3}' | cut -d: -f2)\n",
23672368
" export http_proxy=$proxy; export https_proxy=$http_proxy\n",
2369+
" export HTTP_PROXY=$proxy; export HTTPS_PROXY=$http_proxy\n",
23682370
" echo -e \"[Boto]\nproxy = ${proxy_host}\nproxy_port = ${proxy_port}\n\" >/etc/boto.cfg\n",
23692371
"else\n",
23702372
" proxy_args=\"\"\n",

0 commit comments

Comments
 (0)