Merge branch 'develop'

Author: dougalb

amis.txt

@@ -9,6 +9,7 @@ sa-east-1: ami-12b8347e
 us-east-1: ami-a8535cc2
 us-west-1: ami-6ac2b00a
 us-west-2: ami-e5b25985
+us-gov-west-1: ami-cd14a8ac
 # centos7
 ap-northeast-1: ami-f284919c
 ap-northeast-2: ami-79a06917
@@ -20,6 +21,7 @@ sa-east-1: ami-20b63a4c
 us-east-1: ami-7c555a16
 us-west-1: ami-18d8aa78
 us-west-2: ami-148b6074
+us-gov-west-1: ami-eb15a98a
 # alinux
 ap-northeast-1: ami-5c839632
 ap-northeast-2: ami-85a069eb
@@ -31,6 +33,7 @@ sa-east-1: ami-24bf3348
 us-east-1: ami-1d585777
 us-west-1: ami-1dd8aa7d
 us-west-2: ami-5ab15a3a
+us-gov-west-1: ami-c016aaa1
 # ubuntu1404
 ap-northeast-1: ami-5d839633
 ap-northeast-2: ami-30a36a5e
@@ -42,3 +45,4 @@ sa-east-1: ami-97b73bfb
 us-east-1: ami-7a585710
 us-west-1: ami-0bdeac6b
 us-west-2: ami-f2bf5492
+us-gov-west-1: ami-ee15a98f

cloudformation/cfncluster.cfn.json

@@ -165,11 +165,13 @@
       "Description" : "Type of volume to create either new or from snapshot",
       "Type" : "String",
       "Default" : "gp2",
-      "ConstraintDescription" : "must be a supported volume type: standard, io1, gp2",
+      "ConstraintDescription" : "must be a supported volume type: standard, io1, gp2, st1, sc1",
       "AllowedValues" : [
         "standard",
         "gp2",
-        "io1"
+        "io1",
+        "st1",
+        "sc1"
       ]
     },
     "MasterSubnetId" : {
@@ -1052,10 +1054,10 @@
         "ubuntu1404" : "ami-72945e11"
       },
       "us-gov-west-1" : {
-        "centos6" : "NA",
-        "centos7" : "NA",
-        "alinux" : "NA",
-        "ubuntu1404" : "NA"
+        "centos6" : "ami-cd14a8ac",
+        "centos7" : "ami-eb15a98a",
+        "alinux" : "ami-c016aaa1",
+        "ubuntu1404" : "ami-ee15a98f"
       },
       "ap-northeast-2" : {
         "centos6" : "ami-0ea26b60",
@@ -1085,7 +1087,7 @@
     "CfnClusterVersions" : {
       "default" : {
         "cfncluster" : "cfncluster-1.2.1",
-        "cookbook" : "cfncluster-cookbook-1.2.1",
+        "cookbook" : "cfncluster-cookbook-1.2.2",
         "chef" : "12.8.1",
         "ridley" : "4.5.0",
         "berkshelf" : "4.3.0",
@@ -2042,11 +2044,6 @@
         "MaxSize" : {
           "Ref" : "MaxQueueSize"
         },
-        "AvailabilityZones" : [
-          {
-            "Ref" : "AvailabilityZone"
-          }
-        ],
         "VPCZoneIdentifier" : [
           {
             "Fn::If" : [

docs/source/configuration.rst

@@ -285,7 +285,13 @@ base_os
 """""""
 OS type used in the cluster
 
-Defaults to alinux in the default template. Available options are: alinux, centos6, centos7, ubuntu1404::
+Defaults to alinux in the default template. Available options are: alinux, centos6, centos7, ubuntu1404
+
+Note: The base_os determines the username used to log into the cluster.  
+
+* Centos 6 & 7: ``centos``
+* Ubuntu: ``ubuntu``
+* Amazon Linux: ``ec2-user`` ::
 
     base_os = alinux