Merge branch 'develop' for 1.0.0 release.

CHANGELOG.rst

@@ -2,6 +2,21 @@
 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
+==========
+
+This is a major update for CfnCluster. Boostrapping of the instances has moved from shell scripts into Chef
+receipes. Through the use of Chef, there is now wider base OS support, covering Amazon Linux, CentOS 6 & 7
+and also Ubuntu. All AMIs are now created using the same receipes. All previously capabilites exisit and the 
+changes should be non-instrusive.
+
+
 0.0.22
 ======
 * updates:``ami``: Pulled latest CentOS6 errata

CONTRIBUTORS.txt

@@ -6,3 +6,4 @@ List of contributors:
  - Kenneth Daily - kmdaily at gmail dot com
  - John Lilley - johnbot at ltech dot edu
  - Nelson R Monserrate - MonserrateNelson at JohnDeere dot com
+ - Karl Gutwin - https://github.com/kgutwin

amis.txt

@@ -1,10 +1,48 @@
-us-west-2 ami-f35e56c3
-eu-central-1 ami-0adcd817
-sa-east-1 ami-1ffb7202
-ap-northeast-1 ami-4ed26d4e
-eu-west-1 ami-c05203b7
-us-east-1 ami-f1dd7e9a
-us-west-1 ami-b3956af7
-ap-southeast-2 ami-83a1e1b9
-ap-southeast-1 ami-76f9f524
-us-gov-west-1 ami-43563560
+# centos6
+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-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-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-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

bootstrap/README

@@ -1,11 +1 @@
-This as the bootstrap scripts deployed in an AMI that is launched by the
-CfnCluster CloudFormation template. They are called by cfn-init. They are
-typically installed in /opt/cfncluster
-
-Install
--------
-
-As root:
-
-  # tar xf CfnClusterBootstrap.tar.gz
-  # make install
+This is the bootstrap script called initially during cloud-init

bootstrap/cfncluster-setup.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# CfnCluster setup script. This is called by CloudFormation and
+# ensures the instance is capable of running the bootstap actions.
+
+VERSION=$1
+
+if [ "${VERSION}x" == "x" ]; then
+  echo "Version not set. Exiting."
+  exit 0
+fi
+
+if [ -f /opt/cfncluster/.cfncluster-setup-${VERSION} ]; then
+  runtime=`cat /opt/cfncluster/.cfncluster-setup-${VERSION}`
+  echo "cfncluster previously run at $runtime."
+  echo "Exiting."
+  exit 0
+else
+  rm /opt/cfncluster/.cfncluster-setup-*
+  distro="$(cat /etc/issue | awk ''NR==1'{ print $1 }')"
+  case "$distro" in
+    Ubuntu)
+      apt-get update
+      apt-get install -y build-essential curl
+    ;;
+    CentOS|Amazon|RedHat)
+      yum groupinstall -y "Development Tools"
+      yum install -y curl
+    ;;
+    *)
+      echo "Your distro is not supported." 1>&2
+      exit 1
+    ;;
+  esac
+
+  mkdir -p /opt/cfncluster
+  easy_install -U https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-latest.tar.gz
+  curl -LO https://www.chef.io/chef/install.sh && sudo bash ./install.sh -d /opt/cfncluster -v 12.4.1 && rm install.sh
+  /opt/chef/embedded/bin/gem install berkshelf --no-ri --no-rdoc 2>&1 >/tmp/berkshelf.log
+  echo `date` > /opt/cfncluster/.cfncluster-setup-${VERSION}
+fi