Skip to content

Commit d14a9fc

Browse files
dougalbdougalb
committed
Merge branch 'develop' for 1.0.0 release.
2 parents 69d9cdb + 477a5ea commit d14a9fc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+3044
-3205
lines changed

‎CHANGELOG.rst

+15
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
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+
11+
1.0.0-beta
12+
==========
13+
14+
This is a major update for CfnCluster. Boostrapping of the instances has moved from shell scripts into Chef
15+
receipes. Through the use of Chef, there is now wider base OS support, covering Amazon Linux, CentOS 6 & 7
16+
and also Ubuntu. All AMIs are now created using the same receipes. All previously capabilites exisit and the
17+
changes should be non-instrusive.
18+
19+
520
0.0.22
621
======
722
* updates:``ami``: Pulled latest CentOS6 errata

‎CONTRIBUTORS.txt

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ 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

‎amis.txt

+48-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,48 @@
1-
us-west-2 ami-f35e56c3
2-
eu-central-1 ami-0adcd817
3-
sa-east-1 ami-1ffb7202
4-
ap-northeast-1 ami-4ed26d4e
5-
eu-west-1 ami-c05203b7
6-
us-east-1 ami-f1dd7e9a
7-
us-west-1 ami-b3956af7
8-
ap-southeast-2 ami-83a1e1b9
9-
ap-southeast-1 ami-76f9f524
10-
us-gov-west-1 ami-43563560
1+
# 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
13+
# 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
25+
# 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
37+
# 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

‎bootstrap/Makefile

-9
This file was deleted.

‎bootstrap/README

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,11 +1 @@
1-
This as the bootstrap scripts deployed in an AMI that is launched by the
2-
CfnCluster CloudFormation template. They are called by cfn-init. They are
3-
typically installed in /opt/cfncluster
4-
5-
Install
6-
-------
7-
8-
As root:
9-
10-
# tar xf CfnClusterBootstrap.tar.gz
11-
# make install
1+
This is the bootstrap script called initially during cloud-init

‎bootstrap/cfncluster-setup.sh

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#!/bin/bash
2+
3+
# CfnCluster setup script. This is called by CloudFormation and
4+
# ensures the instance is capable of running the bootstap actions.
5+
6+
VERSION=$1
7+
8+
if [ "${VERSION}x" == "x" ]; then
9+
echo "Version not set. Exiting."
10+
exit 0
11+
fi
12+
13+
if [ -f /opt/cfncluster/.cfncluster-setup-${VERSION} ]; then
14+
runtime=`cat /opt/cfncluster/.cfncluster-setup-${VERSION}`
15+
echo "cfncluster previously run at $runtime."
16+
echo "Exiting."
17+
exit 0
18+
else
19+
rm /opt/cfncluster/.cfncluster-setup-*
20+
distro="$(cat /etc/issue | awk ''NR==1'{ print $1 }')"
21+
case "$distro" in
22+
Ubuntu)
23+
apt-get update
24+
apt-get install -y build-essential curl
25+
;;
26+
CentOS|Amazon|RedHat)
27+
yum groupinstall -y "Development Tools"
28+
yum install -y curl
29+
;;
30+
*)
31+
echo "Your distro is not supported." 1>&2
32+
exit 1
33+
;;
34+
esac
35+
36+
mkdir -p /opt/cfncluster
37+
easy_install -U https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-latest.tar.gz
38+
curl -LO https://www.chef.io/chef/install.sh && sudo bash ./install.sh -d /opt/cfncluster -v 12.4.1 && rm install.sh
39+
/opt/chef/embedded/bin/gem install berkshelf --no-ri --no-rdoc 2>&1 >/tmp/berkshelf.log
40+
echo `date` > /opt/cfncluster/.cfncluster-setup-${VERSION}
41+
fi

‎bootstrap/src/scripts/boot_as_compute

-77
This file was deleted.

‎bootstrap/src/scripts/boot_as_master

-164
This file was deleted.

0 commit comments

Comments
 (0)