Merge branch 'release-1.2.1'

dougalb · dougalb · commit e80cc305e6d7 · 2016-03-24T11:08:31.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,21 @@
+language: python
+
+python:
+  - "2.6"
+  - "2.7"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+
+install: 
+  - cd cli
+  - if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; 
+    then pip install -r requirements26.txt; 
+    else pip install -r requirements.txt;
+    fi
+  - pip install -e .
+  - cd -
+
+sudo: false
+
+script: sh tests/test.sh
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,19 @@
 CHANGELOG
 =========
 
+1.2.1
+=====
+* bugfix:``cfncluster-node``: Use strings in command for sqswatcher on Python 2.6
+* updates:``ami``: Update all base AMIs to latest patch levels
+
+1.2.0
+=====
+* bugfix:``cfncluster-node``: Correctly set slots per host for Openlava
+* updates:``cfncluster-cookbook``: Updated to cfncluster-cookbook-1.2.0
+* updates:``ami``: Updated to SGE 8.1.9
+* updates:``ami``: Updated to Openlava 3.1.3
+* updates:``ami``: Updated to Chef 12.8.1
+
 1.1.0
 =====
 * feature:``cfncluster``: Support for dynamic placement groups
diff --git a/README.rst b/README.rst
@@ -1,6 +1,10 @@
 cfncluster
 ==========
 
+.. image:: https://travis-ci.org/awslabs/cfncluster.png?branch=develop
+   :target: https://travis-ci.org/awslabs/cfncluster
+   :alt: Build Status
+
 CfnCluster ("cloud formation cluster") is a framework that deploys and maintains high performance computing clusters on Amazon Web Services (AWS). Developed by AWS, CfnCluster facilitates both quick start proof of concepts (POCs) and production deployments. CfnCluster supports many different types of clustered applications and can easily be extended to support different frameworks. The CLI is stateless, everything is done using CloudFormation or resources within AWS.
 
 Documentation
diff --git a/amis.txt b/amis.txt
@@ -1,44 +1,44 @@
 # centos6
-ap-northeast-1: ami-4540402b
-ap-northeast-2: ami-bb29e7d5
-ap-southeast-1: ami-00ce0763
-ap-southeast-2: ami-d17c5ab2
-eu-central-1: ami-e53d2789
-eu-west-1: ami-6aba0719
-sa-east-1: ami-192fac75
-us-east-1: ami-ac7343c6
-us-west-1: ami-3f8ffe5f
-us-west-2: ami-6c46a50c
+ap-northeast-1: ami-3b809555
+ap-northeast-2: ami-0ea26b60
+ap-southeast-1: ami-2b945e48
+ap-southeast-2: ami-20b99943
+eu-central-1: ami-1ee90f71
+eu-west-1: ami-b30a8ec0
+sa-east-1: ami-12b8347e
+us-east-1: ami-a8535cc2
+us-west-1: ami-6ac2b00a
+us-west-2: ami-e5b25985
 # centos7
-ap-northeast-1: ami-2c424242
-ap-northeast-2: ami-df27e9b1
-ap-southeast-1: ami-4cc0092f
-ap-southeast-2: ami-b17b5dd2
-eu-central-1: ami-45302a29
-eu-west-1: ami-b5bb06c6
-sa-east-1: ami-162caf7a
-us-east-1: ami-d77343bd
-us-west-1: ami-128ffe72
-us-west-2: ami-5447a434
+ap-northeast-1: ami-f284919c
+ap-northeast-2: ami-79a06917
+ap-southeast-1: ami-87945ee4
+ap-southeast-2: ami-cfba9aac
+eu-central-1: ami-1fe90f70
+eu-west-1: ami-2d0e8a5e
+sa-east-1: ami-20b63a4c
+us-east-1: ami-7c555a16
+us-west-1: ami-18d8aa78
+us-west-2: ami-148b6074
 # alinux
-ap-northeast-1: ami-824646ec
-ap-northeast-2: ami-ec2be582
-ap-southeast-1: ami-b0ce07d3
-ap-southeast-2: ami-cb7d5ba8
-eu-central-1: ami-a6302aca
-eu-west-1: ami-0ab70a79
-sa-east-1: ami-472caf2b
-us-east-1: ami-9c7646f6
-us-west-1: ami-898ffee9
-us-west-2: ami-b347a4d3
+ap-northeast-1: ami-5c839632
+ap-northeast-2: ami-85a069eb
+ap-southeast-1: ami-ef955f8c
+ap-southeast-2: ami-9fb999fc
+eu-central-1: ami-48f71127
+eu-west-1: ami-6a0e8a19
+sa-east-1: ami-24bf3348
+us-east-1: ami-1d585777
+us-west-1: ami-1dd8aa7d
+us-west-2: ami-5ab15a3a
 # ubuntu1404
-ap-northeast-1: ami-5245453c
-ap-northeast-2: ami-5c2ae432
-ap-southeast-1: ami-cdc20bae
-ap-southeast-2: ami-f97b5d9a
-eu-central-1: ami-a8302ac4
-eu-west-1: ami-1cb70a6f
-sa-east-1: ami-1632b17a
-us-east-1: ami-f3764699
-us-west-1: ami-bf8effdf
-us-west-2: ami-534ba833
+ap-northeast-1: ami-5d839633
+ap-northeast-2: ami-30a36a5e
+ap-southeast-1: ami-72945e11
+ap-southeast-2: ami-c7ba9aa4
+eu-central-1: ami-38e80e57
+eu-west-1: ami-7b088c08
+sa-east-1: ami-97b73bfb
+us-east-1: ami-7a585710
+us-west-1: ami-0bdeac6b
+us-west-2: ami-f2bf5492
diff --git a/cli/requirements.txt b/cli/requirements.txt
@@ -0,0 +1 @@
+boto>=2.39
diff --git a/cli/requirements26.txt b/cli/requirements26.txt
@@ -0,0 +1,2 @@
+boto>=2.39
+argparse>=1.1
diff --git a/cli/setup.py b/cli/setup.py
@@ -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.1.1"
-requires = ['boto>=2.39'] 
+version = "1.2.1"
+requires = ['boto>=2.39', 'awscli>=1.10.13'] 
 
 if sys.version_info[:2] == (2, 6):
     # For python2.6 we have to require argparse since it
diff --git a/cloudformation/cfncluster.cfn.json b/cloudformation/cfncluster.cfn.json
@@ -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-201602192042 cfncluster-1.1.0",
+  "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-201603231645 cfncluster-1.2.1",
   "Parameters" : {
     "KeyName" : {
       "Description" : "Name of an existing EC2 KeyPair to enable SSH access to the instances",
@@ -998,58 +998,58 @@
     },
     "AWSRegionOS2AMI" : {
       "eu-west-1" : {
-        "centos6" : "ami-6aba0719",
-        "centos7" : "ami-b5bb06c6",
-        "alinux" : "ami-0ab70a79",
-        "ubuntu1404" : "ami-1cb70a6f"
+        "centos6" : "ami-b30a8ec0",
+        "centos7" : "ami-2d0e8a5e",
+        "alinux" : "ami-6a0e8a19",
+        "ubuntu1404" : "ami-7b088c08"
       },
       "us-west-2" : {
-        "centos6" : "ami-6c46a50c",
-        "centos7" : "ami-5447a434",
-        "alinux" : "ami-b347a4d3",
-        "ubuntu1404" : "ami-534ba833"
+        "centos6" : "ami-e5b25985",
+        "centos7" : "ami-148b6074",
+        "alinux" : "ami-5ab15a3a",
+        "ubuntu1404" : "ami-f2bf5492"
       },
       "eu-central-1" : {
-        "centos6" : "ami-e53d2789",
-        "centos7" : "ami-45302a29",
-        "alinux" : "ami-a6302aca",
-        "ubuntu1404" : "ami-a8302ac4"
+        "centos6" : "ami-1ee90f71",
+        "centos7" : "ami-1fe90f70",
+        "alinux" : "ami-48f71127",
+        "ubuntu1404" : "ami-38e80e57"
       },
       "sa-east-1" : {
-        "centos6" : "ami-192fac75",
-        "centos7" : "ami-162caf7a",
-        "alinux" : "ami-472caf2b",
-        "ubuntu1404" : "ami-1632b17a"
+        "centos6" : "ami-12b8347e",
+        "centos7" : "ami-20b63a4c",
+        "alinux" : "ami-24bf3348",
+        "ubuntu1404" : "ami-97b73bfb"
       },
       "ap-northeast-1" : {
-        "centos6" : "ami-4540402b",
-        "centos7" : "ami-2c424242",
-        "alinux" : "ami-824646ec",
-        "ubuntu1404" : "ami-5245453c"
+        "centos6" : "ami-3b809555",
+        "centos7" : "ami-f284919c",
+        "alinux" : "ami-5c839632",
+        "ubuntu1404" : "ami-5d839633"
       },
       "us-east-1" : {
-        "centos6" : "ami-ac7343c6",
-        "centos7" : "ami-d77343bd",
-        "alinux" : "ami-9c7646f6",
-        "ubuntu1404" : "ami-f3764699"
+        "centos6" : "ami-a8535cc2",
+        "centos7" : "ami-7c555a16",
+        "alinux" : "ami-1d585777",
+        "ubuntu1404" : "ami-7a585710"
       },
       "us-west-1" : {
-        "centos6" : "ami-3f8ffe5f",
-        "centos7" : "ami-128ffe72",
-        "alinux" : "ami-898ffee9",
-        "ubuntu1404" : "ami-bf8effdf"
+        "centos6" : "ami-6ac2b00a",
+        "centos7" : "ami-18d8aa78",
+        "alinux" : "ami-1dd8aa7d",
+        "ubuntu1404" : "ami-0bdeac6b"
       },
       "ap-southeast-2" : {
-        "centos6" : "ami-d17c5ab2",
-        "centos7" : "ami-b17b5dd2",
-        "alinux" : "ami-cb7d5ba8",
-        "ubuntu1404" : "ami-f97b5d9a"
+        "centos6" : "ami-20b99943",
+        "centos7" : "ami-cfba9aac",
+        "alinux" : "ami-9fb999fc",
+        "ubuntu1404" : "ami-c7ba9aa4"
       },
       "ap-southeast-1" : {
-        "centos6" : "ami-00ce0763",
-        "centos7" : "ami-4cc0092f",
-        "alinux" : "ami-b0ce07d3",
-        "ubuntu1404" : "ami-cdc20bae"
+        "centos6" : "ami-2b945e48",
+        "centos7" : "ami-87945ee4",
+        "alinux" : "ami-ef955f8c",
+        "ubuntu1404" : "ami-72945e11"
       },
       "us-gov-west-1" : {
         "centos6" : "NA",
@@ -1058,10 +1058,10 @@
         "ubuntu1404" : "NA"
       },
       "ap-northeast-2" : {
-        "centos6" : "ami-bb29e7d5",
-        "centos7" : "ami-df27e9b1",
-        "alinux" : "ami-ec2be582",
-        "ubuntu1404" : "ami-5c2ae432"
+        "centos6" : "ami-0ea26b60",
+        "centos7" : "ami-79a06917",
+        "alinux" : "ami-85a069eb",
+        "ubuntu1404" : "ami-30a36a5e"
       }
     },
     "OSFeatures" : {
@@ -1084,12 +1084,12 @@
     },
     "CfnClusterVersions" : {
       "default" : {
-        "cfncluster" : "cfncluster-1.1.0",
-        "cookbook" : "cfncluster-cookbook-1.1.0",
-        "chef" : "12.4.3",
-        "ridley" : "4.3.2",
-        "berkshelf" : "4.0.1",
-        "ami" : "201602192042"
+        "cfncluster" : "cfncluster-1.2.1",
+        "cookbook" : "cfncluster-cookbook-1.2.1",
+        "chef" : "12.8.1",
+        "ridley" : "4.5.0",
+        "berkshelf" : "4.3.0",
+        "ami" : "201603231645"
       }
     },
     "AWSRegion2Capabilites" : {
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -50,9 +50,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.0'
+version = '1.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.1'
+release = '1.2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst
@@ -285,7 +285,7 @@ base_os
 """""""
 OS type used in the cluster
  
-Defaults to alinux in the default template. ::
+Defaults to alinux in the default template. Available options are: alinux, centos6, centos7, ubuntu1404::
 
     base_os = alinux
 
diff --git a/tests/install.sh b/tests/install.sh
@@ -0,0 +1,4 @@
+env
+cd cli
+pip install -r requirements.txt
+pip install -e .
diff --git a/tests/test.sh b/tests/test.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+# Very basic first tests
+
+set -x
+echo $PATH
+which cfncluster

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +env
 +cd cli
 +pip install -r requirements.txt
 +pip install -e .