Skip to content

Commit

Permalink
Final bits for the 1.0.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
dougalb committed Feb 15, 2016
1 parent f2e24d7 commit 477a5ea
Show file tree
Hide file tree
Showing 4 changed files with 104 additions and 92 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
CHANGELOG
=========

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

1.0.0-beta
==========

Expand Down
84 changes: 44 additions & 40 deletions amis.txt
Original file line number Diff line number Diff line change
@@ -1,44 +1,48 @@
# centos6
ap-northeast-1: ami-e19da68f
ap-northeast-2: ami-c4f03eaa
ap-southeast-1: ami-2e5e914d
ap-southeast-2: ami-8fd4f0ec
eu-central-1: ami-71c0d81d
eu-west-1: ami-a1bb0dd2
sa-east-1: ami-1614947a
us-east-1: ami-29567943
us-west-1: ami-74304614
us-west-2: ami-839375e3
ap-northeast-1: ami-37060159
ap-northeast-2: ami-0e1ad460
ap-southeast-1: ami-3a2ee059
ap-southeast-2: ami-d91e39ba
eu-central-1: ami-3fc4df53
eu-west-1: ami-b9e95aca
sa-east-1: ami-87890aeb
us-east-1: ami-a22114c8
us-west-1: ami-cdd4a2ad
us-west-2: ami-46ec0c26
us-gov-west-1: ami-1dc27e7c
# centos7
ap-northeast-1: ami-dd97acb3
ap-northeast-2: ami-b5f739db
ap-southeast-1: ami-af5d92cc
ap-southeast-2: ami-84d5f1e7
eu-central-1: ami-adc4dcc1
eu-west-1: ami-0db90f7e
sa-east-1: ami-0216966e
us-east-1: ami-e0537c8a
us-west-1: ami-7e31471e
us-west-2: ami-ea90768a
ap-northeast-1: ami-b40304da
ap-northeast-2: ami-991fd1f7
ap-southeast-1: ami-1b2ae478
ap-southeast-2: ami-801c3be3
eu-central-1: ami-e7fbe08b
eu-west-1: ami-25d56656
sa-east-1: ami-e48d0e88
us-east-1: ami-682e1b02
us-west-1: ami-1ad7a17a
us-west-2: ami-04f11164
us-gov-west-1: ami-3cbe025d
# alinux
ap-northeast-1: ami-4b89b225
ap-northeast-2: ami-c3f53bad
ap-southeast-1: ami-bd5d92de
ap-southeast-2: ami-c8d5f1ab
eu-central-1: ami-88c3dbe4
eu-west-1: ami-cfbd0bbc
sa-east-1: ami-65139309
us-east-1: ami-d4537cbe
us-west-1: ami-35304655
us-west-2: ami-529f7932
ap-northeast-1: ami-5503043b
ap-northeast-2: ami-591fd137
ap-southeast-1: ami-b42ee0d7
ap-southeast-2: ami-8a1c3be9
eu-central-1: ami-79c4df15
eu-west-1: ami-88d360fb
sa-east-1: ami-af9211c3
us-east-1: ami-0b2b1e61
us-west-1: ami-3bd6a05b
us-west-2: ami-31f01051
us-gov-west-1: ami-6eb8040f
# ubuntu1404
ap-northeast-1: ami-fd83b893
ap-northeast-2: ami-27f63849
ap-southeast-1: ami-6e5b940d
ap-southeast-2: ami-6cd7f30f
eu-central-1: ami-b1c5dddd
eu-west-1: ami-7cbb0d0f
sa-east-1: ami-1613937a
us-east-1: ami-2a2e0140
us-west-1: ami-10304670
us-west-2: ami-fe9a7c9e
ap-northeast-1: ami-ba0106d4
ap-northeast-2: ami-581fd136
ap-southeast-1: ami-832fe1e0
ap-southeast-2: ami-ab1a3dc8
eu-central-1: ami-17fbe07b
eu-west-1: ami-c5d261b6
sa-east-1: ami-998d0ef5
us-east-1: ami-5114213b
us-west-1: ami-3be99f5b
us-west-2: ami-72f31312
us-gov-west-1: ami-a0ba06c1
8 changes: 4 additions & 4 deletions cli/setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2013-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
# Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the
# License. A copy of the License is located at
Expand All @@ -20,8 +20,8 @@ def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()

console_scripts = ['cfncluster = cfncluster.cli:main']
version = "1.0.0b3"
requires = ['boto>=2.38']
version = "1.0.0"
requires = ['boto>=2.39']

if sys.version_info[:2] == (2, 6):
# For python2.6 we have to require argparse since it
Expand All @@ -46,7 +46,7 @@ def read(fname):
},
long_description=read('README'),
classifiers=[
"Development Status :: 4 - Beta",
"Development Status :: 5 - Production/Stable",
"Environment :: Console",
"Programming Language :: Python",
"Topic :: Scientific/Engineering",
Expand Down
98 changes: 50 additions & 48 deletions cloudformation/cfncluster.cfn.json
Original file line number Diff line number Diff line change
@@ -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-201602011823 cfncluster-1.0.0b3",
"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",
"Parameters" : {
"KeyName" : {
"Description" : "Name of an existing EC2 KeyPair to enable SSH access to the instances",
Expand Down Expand Up @@ -983,70 +983,70 @@
},
"AWSRegionOS2AMI" : {
"eu-west-1" : {
"centos6" : "ami-a1bb0dd2",
"centos7" : "ami-0db90f7e",
"alinux" : "ami-cfbd0bbc",
"ubuntu1404" : "ami-7cbb0d0f"
"centos6" : "ami-b9e95aca",
"centos7" : "ami-25d56656",
"alinux" : "ami-88d360fb",
"ubuntu1404" : "ami-c5d261b6"
},
"us-west-2" : {
"centos6" : "ami-839375e3",
"centos7" : "ami-ea90768a",
"alinux" : "ami-529f7932",
"ubuntu1404" : "ami-fe9a7c9e"
"centos6" : "ami-46ec0c26",
"centos7" : "ami-04f11164",
"alinux" : "ami-31f01051",
"ubuntu1404" : "ami-72f31312"
},
"eu-central-1" : {
"centos6" : "ami-71c0d81d",
"centos7" : "ami-adc4dcc1",
"alinux" : "ami-88c3dbe4",
"ubuntu1404" : "ami-b1c5dddd"
"centos6" : "ami-3fc4df53",
"centos7" : "ami-e7fbe08b",
"alinux" : "ami-79c4df15",
"ubuntu1404" : "ami-17fbe07b"
},
"sa-east-1" : {
"centos6" : "ami-1614947a",
"centos7" : "ami-0216966e",
"alinux" : "ami-65139309",
"ubuntu1404" : "ami-1613937a"
"centos6" : "ami-87890aeb",
"centos7" : "ami-e48d0e88",
"alinux" : "ami-af9211c3",
"ubuntu1404" : "ami-998d0ef5"
},
"ap-northeast-1" : {
"centos6" : "ami-e19da68f",
"centos7" : "ami-dd97acb3",
"alinux" : "ami-4b89b225",
"ubuntu1404" : "ami-fd83b893"
"centos6" : "ami-37060159",
"centos7" : "ami-b40304da",
"alinux" : "ami-5503043b",
"ubuntu1404" : "ami-ba0106d4"
},
"us-east-1" : {
"centos6" : "ami-29567943",
"centos7" : "ami-e0537c8a",
"alinux" : "ami-d4537cbe",
"ubuntu1404" : "ami-2a2e0140"
"centos6" : "ami-a22114c8",
"centos7" : "ami-682e1b02",
"alinux" : "ami-0b2b1e61",
"ubuntu1404" : "ami-5114213b"
},
"us-west-1" : {
"centos6" : "ami-74304614",
"centos7" : "ami-7e31471e",
"alinux" : "ami-35304655",
"ubuntu1404" : "ami-10304670"
"centos6" : "ami-cdd4a2ad",
"centos7" : "ami-1ad7a17a",
"alinux" : "ami-3bd6a05b",
"ubuntu1404" : "ami-3be99f5b"
},
"ap-southeast-2" : {
"centos6" : "ami-8fd4f0ec",
"centos7" : "ami-84d5f1e7",
"alinux" : "ami-c8d5f1ab",
"ubuntu1404" : "ami-6cd7f30f"
"centos6" : "ami-d91e39ba",
"centos7" : "ami-801c3be3",
"alinux" : "ami-8a1c3be9",
"ubuntu1404" : "ami-ab1a3dc8"
},
"ap-southeast-1" : {
"centos6" : "ami-2e5e914d",
"centos7" : "ami-af5d92cc",
"alinux" : "ami-bd5d92de",
"ubuntu1404" : "ami-6e5b940d"
"centos6" : "ami-3a2ee059",
"centos7" : "ami-1b2ae478",
"alinux" : "ami-b42ee0d7",
"ubuntu1404" : "ami-832fe1e0"
},
"us-gov-west-1" : {
"centos6" : "NA",
"centos7" : "NA",
"alinux" : "NA",
"ubuntu1404" : "NA"
"centos6" : "ami-1dc27e7c",
"centos7" : "ami-3cbe025d",
"alinux" : "ami-6eb8040f",
"ubuntu1404" : "ami-a0ba06c1"
},
"ap-northeast-2" : {
"centos6" : "ami-c4f03eaa",
"centos7" : "ami-b5f739db",
"alinux" : "ami-c3f53bad",
"ubuntu1404" : "ami-27f63849"
"centos6" : "ami-0e1ad460",
"centos7" : "ami-991fd1f7",
"alinux" : "ami-591fd137",
"ubuntu1404" : "ami-581fd136"
}
},
"OSFeatures" : {
Expand All @@ -1069,12 +1069,12 @@
},
"CfnClusterVersions" : {
"default" : {
"cfncluster" : "cfncluster-1.0.0b3",
"cookbook" : "cfncluster-cookbook-0.4.0",
"cfncluster" : "cfncluster-1.0.0",
"cookbook" : "cfncluster-cookbook-1.0.0",
"chef" : "12.4.3",
"ridley" : "4.3.2",
"berkshelf" : "4.0.1",
"ami" : "201602011823"
"ami" : "201602120030"
}
},
"AWSRegion2Capabilites" : {
Expand Down Expand Up @@ -1695,6 +1695,7 @@
" proxy_host=$(echo \"$proxy\" | awk -F/ '{print $3}' | cut -d: -f1)\n",
" proxy_port=$(echo \"$proxy\" | awk -F/ '{print $3}' | cut -d: -f2)\n",
" export http_proxy=$proxy; export https_proxy=$http_proxy\n",
" export HTTP_PROXY=$proxy; export HTTPS_PROXY=$http_proxy\n",
" echo -e \"[Boto]\nproxy = ${proxy_host}\nproxy_port = ${proxy_port}\n\" >/etc/boto.cfg\n",
"else\n",
" proxy_args=\"\"\n",
Expand Down Expand Up @@ -2365,6 +2366,7 @@
" proxy_host=$(echo \"$proxy\" | awk -F/ '{print $3}' | cut -d: -f1)\n",
" proxy_port=$(echo \"$proxy\" | awk -F/ '{print $3}' | cut -d: -f2)\n",
" export http_proxy=$proxy; export https_proxy=$http_proxy\n",
" export HTTP_PROXY=$proxy; export HTTPS_PROXY=$http_proxy\n",
" echo -e \"[Boto]\nproxy = ${proxy_host}\nproxy_port = ${proxy_port}\n\" >/etc/boto.cfg\n",
"else\n",
" proxy_args=\"\"\n",
Expand Down

0 comments on commit 477a5ea

Please sign in to comment.