Release v5.1.0 - Update to latest AMI and fix a few minor template is…

…sues

Signed-off-by: Irving Popovetsky <[email protected]>

README.md

@@ -37,8 +37,8 @@ You can launch this stack with the push of a button:
 
 | Edition | Version | Est Monthly cost | Launch button |
 | ------- | ------- | ---------------- | ------------- |
-| High Performance | 5.0.5 | [$1500*](https://calculator.s3.amazonaws.com/index.html#r=IAD&s=EC2&key=calc-E9251374-D80C-45B7-BED7-C9C9778B1D6C) | <p><a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?templateURL=https:%2F%2Fs3.amazonaws.com%2Faws-native-chef-server%2F5.0.5%2Fmain.yaml&amp;stackName=my-chef-stack" target="_blank"><img src="https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png" alt="Launch Stack" /></a></p> |
-| Lowest Cost | 5.0.5 | [$320*](https://calculator.s3.amazonaws.com/index.html#r=IAD&s=EC2&key=files/calc-165638db8e331664846c0d6654d743377bd3eac6&v=ver20190604sQ) | <p><a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?templateURL=https:%2F%2Fs3.amazonaws.com%2Faws-native-chef-server%2F5.0.5%2Fmarketplace.yaml&amp;stackName=my-chef-stack" target="_blank"><img src="https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png" alt="Launch Stack" /></a></p> |
+| High Performance | 5.1.0 | [$1500*](https://calculator.s3.amazonaws.com/index.html#r=IAD&s=EC2&key=calc-E9251374-D80C-45B7-BED7-C9C9778B1D6C) | <p><a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?templateURL=https:%2F%2Fs3.amazonaws.com%2Faws-native-chef-server%2F5.1.0%2Fmain.yaml&amp;stackName=my-chef-stack" target="_blank"><img src="https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png" alt="Launch Stack" /></a></p> |
+| Lowest Cost | 5.1.0 | [$320*](https://calculator.s3.amazonaws.com/index.html#r=IAD&s=EC2&key=files/calc-165638db8e331664846c0d6654d743377bd3eac6&v=ver20190604sQ) | <p><a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?templateURL=https:%2F%2Fs3.amazonaws.com%2Faws-native-chef-server%2F5.1.0%2Fmarketplace.yaml&amp;stackName=my-chef-stack" target="_blank"><img src="https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png" alt="Launch Stack" /></a></p> |
 
 _*NOTE: Estimated costs are just that, your mileage will vary. Use reserved instances to greatly reduce costs for long-running clusters._
 
@@ -48,7 +48,7 @@ However, the most repeatable and least error-prone way to launch this stack is t
 ```bash
 MYBUCKET=aws-native-chef-server
 MYID=mycompany
-VERSION=5.0.5
+VERSION=5.1.0
 EDITION=main  # main or marketplace
 # Configure the automate_stack_parameters.json and then launch the cloudformation stack:
 # If you're using your own bucket, uncomment the next line:
@@ -69,7 +69,7 @@ If you've made changes to the template content or parameters and you wish to upd
 ```bash
 MYBUCKET=aws-native-chef-server
 MYID=mycompany
-VERSION=5.0.5
+VERSION=5.1.0
 EDITION=main  # main or marketplace
 # If you're using your own bucket, uncomment the next line:
 # aws s3 sync . s3://$MYBUCKET/$VERSION/ --exclude "*" --include "*.yaml" --include "files/*" && \

automate.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native Automate 2 (auto-recovering standalone) v5.0.5
+Description: AWS Native Automate 2 (auto-recovering standalone) v5.1.0
 
 Parameters:
   # Required Parameters

chef_elasticsearch.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Chef Server Elasticsearch 5.0.5
+Description: Chef Server Elasticsearch 5.1.0
 
 Parameters:
   # Required Parameters

chef_rds.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Chef Server PostgreSQL v5.0.5
+Description: Chef Server PostgreSQL v5.1.0
 
 Parameters:
   # Required Parameters

chef_server_ha.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native Chef Server (auto-scaling HA) v5.0.5
+Description: AWS Native Chef Server (auto-scaling HA) v5.1.0
 
 Parameters:
   # Required Parameters
@@ -194,7 +194,7 @@ Parameters:
     Type: String
   TemplateVersion:
     Type: String
-    Default: "5.0.5"
+    Default: "5.1.0"
 
 Metadata:
   cfn-lint:
@@ -484,7 +484,7 @@ Resources:
             /etc/opscode-push-jobs-server/opscode-push-jobs-server.rb:
               content: !Sub |
                 opscode_pushy_server['vip'] = '127.0.0.1'
-                opscode_pushy_server['server_name_advertised'] = '${ChefPJELB.DNSName}'
+                opscode_pushy_server['server_name_advertised'] = '${ChefPJELB.DNSName}'.downcase
             /etc/chef-manage/manage.rb:
               content: !Sub |
                 disable_sign_up ${DisableSignup}

chef_server_ops_dashboard.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native OpsDashboard for Chef Server v5.0.5
+Description: AWS Native OpsDashboard for Chef Server v5.1.0
 
 Parameters:
   # Required Parameters

files/main.sh

@@ -36,12 +36,12 @@ function upload_config () {
 }
 
 function server_reconfigure () {
-  chef-server-ctl reconfigure --accept-license
+  chef-server-ctl reconfigure --chef-license=accept
   chef-manage-ctl reconfigure --accept-license
 }
 
 function server_upgrade () {
-  chef-server-ctl reconfigure --accept-license
+  chef-server-ctl reconfigure --chef-license=accept
   chef-server-ctl upgrade
   chef-server-ctl start
   chef-manage-ctl reconfigure --accept-license

generate_os_mappings.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-CENTOS_RELEASE='aws-native-chef-server-5.0.*'
+CENTOS_RELEASE='aws-native-chef-server-5.1.*'
 IMAGE_OWNERID="446539779517"
 
 printf "Mappings:\n  AMI:\n"

main.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native Chef Stack v5.0.5
+Description: AWS Native Chef Stack v5.1.0
 
 Parameters:
   # Required Parameters
@@ -16,12 +16,15 @@ Parameters:
   LoadBalancerSubnets:
     Description: Provide a comma separated list of Subnet IDs for the load balancers (Leave blank to use the ServerSubnets specified above)
     Type: CommaDelimitedList
+    Default: ''
   DatabaseSubnets:
     Description: Provide a comma separated list of Subnet IDs for the Postgres database (Leave blank to use the ServerSubnets specified above)
     Type: CommaDelimitedList
+    Default: ''
   ElasticSearchSubnets:
     Description: Provide a comma separated list of Subnet IDs for the ElasticSearch cluster (Leave blank to use the ServerSubnets specified above)
     Type: CommaDelimitedList
+    Default: ''
   InboundAdminSecurityGroupId:
     Description: Select an existing Security Group in your VPC to define administrative ACLs (SSH, monitoring tools, etc) to the Chef servers
     Type: AWS::EC2::SecurityGroup::Id
@@ -207,7 +210,7 @@ Parameters:
   TemplateVersion:
     Description: The version of this template to use (do not change this unless directed by support)
     Type: String
-    Default: "5.0.5"
+    Default: "5.1.0"
   Route53HostedZone:
     Type: String
     Default: ''
@@ -298,37 +301,37 @@ Conditions:
 Mappings:
   AMI:
     eu-north-1:
-      centos: ami-07e92b1883d55d7bc
+      centos: ami-0b9af355d644500ce
     ap-south-1:
-      centos: ami-0d78c3bf6a2fdf20a
+      centos: ami-0d55d5856a64a8918
     eu-west-3:
-      centos: ami-0db035db681454e21
+      centos: ami-0dedf3f53f2557591
     eu-west-2:
-      centos: ami-09a6b6a433a42973c
+      centos: ami-04c86e4a44288c442
     eu-west-1:
-      centos: ami-0727179e13c301985
+      centos: ami-0b34ea9402583cc17
     ap-northeast-2:
-      centos: ami-08b90868ad438e29e
+      centos: ami-021ab66ea3552f872
     ap-northeast-1:
-      centos: ami-023ea71133db36dfd
+      centos: ami-083a80ec77b6c48f5
     sa-east-1:
-      centos: ami-098444de08c579c10
+      centos: ami-034441c2a437922b1
     ca-central-1:
-      centos: ami-01c1b4cb8890bb62b
+      centos: ami-0fae7558a8c3d4683
     ap-southeast-1:
-      centos: ami-085d925f40fe1373e
+      centos: ami-073d575257d1d42ea
     ap-southeast-2:
-      centos: ami-0f609dec884bb5c57
+      centos: ami-0595dd171f0627906
     eu-central-1:
-      centos: ami-0a260d2225c9b4e68
+      centos: ami-0ad4e9dfe9704c7a5
     us-east-1:
-      centos: ami-0286006e3661294a9
+      centos: ami-093b02d3970c7616d
     us-east-2:
-      centos: ami-0c3d358aecb129e20
+      centos: ami-0aa5e3a0d1fda1498
     us-west-1:
-      centos: ami-0a79079da071240ee
+      centos: ami-08e6c19ae4c1a2267
     us-west-2:
-      centos: ami-04699292ef1d82f98
+      centos: ami-01ddf45199de44e71
 
 Resources:
   ChefRole:

marketplace.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native Chef Stack for Marketplace v5.0.5
+Description: AWS Native Chef Stack for Marketplace v5.1.0
 
 Parameters:
   # Required Parameters
@@ -16,12 +16,15 @@ Parameters:
   LoadBalancerSubnets:
     Description: Provide a comma separated list of Subnet IDs for the load balancers (Leave blank to use the ServerSubnets specified above)
     Type: CommaDelimitedList
+    Default: ''
   DatabaseSubnets:
     Description: Provide a comma separated list of Subnet IDs for the Postgres database (Leave blank to use the ServerSubnets specified above)
     Type: CommaDelimitedList
+    Default: ''
   ElasticSearchSubnets:
     Description: Provide a comma separated list of Subnet IDs for the ElasticSearch cluster (Leave blank to use the ServerSubnets specified above)
     Type: CommaDelimitedList
+    Default: ''
   KeyName:
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instance
     Type: AWS::EC2::KeyPair::KeyName
@@ -195,7 +198,7 @@ Parameters:
   TemplateVersion:
     Description: The version of this template to use (do not change this unless directed by support)
     Type: String
-    Default: "5.0.5"
+    Default: "5.1.0"
   LogsRetentionInDays:
     Description: Specifies the number of days you want to retain cloudwatch log events.
     Type: Number
@@ -276,37 +279,37 @@ Metadata:
 Mappings:
   AMI:
     eu-north-1:
-      centos: ami-07e92b1883d55d7bc
+      centos: ami-0b9af355d644500ce
     ap-south-1:
-      centos: ami-0d78c3bf6a2fdf20a
+      centos: ami-0d55d5856a64a8918
     eu-west-3:
-      centos: ami-0db035db681454e21
+      centos: ami-0dedf3f53f2557591
     eu-west-2:
-      centos: ami-09a6b6a433a42973c
+      centos: ami-04c86e4a44288c442
     eu-west-1:
-      centos: ami-0727179e13c301985
+      centos: ami-0b34ea9402583cc17
     ap-northeast-2:
-      centos: ami-08b90868ad438e29e
+      centos: ami-021ab66ea3552f872
     ap-northeast-1:
-      centos: ami-023ea71133db36dfd
+      centos: ami-083a80ec77b6c48f5
     sa-east-1:
-      centos: ami-098444de08c579c10
+      centos: ami-034441c2a437922b1
     ca-central-1:
-      centos: ami-01c1b4cb8890bb62b
+      centos: ami-0fae7558a8c3d4683
     ap-southeast-1:
-      centos: ami-085d925f40fe1373e
+      centos: ami-073d575257d1d42ea
     ap-southeast-2:
-      centos: ami-0f609dec884bb5c57
+      centos: ami-0595dd171f0627906
     eu-central-1:
-      centos: ami-0a260d2225c9b4e68
+      centos: ami-0ad4e9dfe9704c7a5
     us-east-1:
-      centos: ami-0286006e3661294a9
+      centos: ami-093b02d3970c7616d
     us-east-2:
-      centos: ami-0c3d358aecb129e20
+      centos: ami-0aa5e3a0d1fda1498
     us-west-1:
-      centos: ami-0a79079da071240ee
+      centos: ami-08e6c19ae4c1a2267
     us-west-2:
-      centos: ami-04699292ef1d82f98
+      centos: ami-01ddf45199de44e71
 
 Resources:
   ChefRole:

supermarket.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native Supermarket (auto-recovering standalone) v5.0.5
+Description: AWS Native Supermarket (auto-recovering standalone) v5.1.0
 
 Parameters:
   # Required Parameters