Merge pull request #74 from chef-customers/gsreynolds/update_amis_fix_lint

Version 5.1.1

Author: gsreynolds

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.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> |
+| High Performance | 5.1.1 | [$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.1%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.1 | [$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.1%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.1.0
+VERSION=5.1.1
 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.1.0
+VERSION=5.1.1
 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.1.0
+Description: AWS Native Automate 2 (auto-recovering standalone) v5.1.1
 
 Parameters:
   # Required Parameters
@@ -443,7 +443,7 @@ Resources:
       Name: !Sub ${Route53RecordName}.${Route53HostedZone}.
       Comment: !Sub Created by Cloudformation ${AWS::StackName}
       Type: CNAME
-      TTL: '900'
+      TTL: 900
       ResourceRecords:
       - !GetAtt ChefALB.DNSName
 

chef_elasticsearch.yaml

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

chef_rds.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Chef Server PostgreSQL v5.1.0
+Description: Chef Server PostgreSQL v5.1.1
 
 Parameters:
   # Required Parameters
@@ -107,6 +107,7 @@ Resources:
   DBPostgres:
     Type: AWS::RDS::DBInstance
     DeletionPolicy: 'Snapshot'
+    UpdateReplacePolicy: 'Snapshot'
     Properties:
       DBName: chef
       AllocatedStorage: !Ref DBAllocatedStorage

chef_server_ha.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native Chef Server (auto-scaling HA) v5.1.0
+Description: AWS Native Chef Server (auto-scaling HA) v5.1.1
 
 Parameters:
   # Required Parameters
@@ -194,7 +194,7 @@ Parameters:
     Type: String
   TemplateVersion:
     Type: String
-    Default: "5.1.0"
+    Default: "5.1.1"
 
 Metadata:
   cfn-lint:
@@ -768,7 +768,7 @@ Resources:
       Name: !Sub ${Route53RecordName}.${Route53HostedZone}.
       Comment: !Sub Created by Cloudformation ${AWS::StackName}
       Type: CNAME
-      TTL: '900'
+      TTL: 900
       ResourceRecords:
       - !GetAtt ChefALB.DNSName
 

chef_server_ops_dashboard.yaml

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

main.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native Chef Stack v5.1.0
+Description: AWS Native Chef Stack v5.1.1
 
 Parameters:
   # Required Parameters
@@ -210,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.1.0"
+    Default: "5.1.1"
   Route53HostedZone:
     Type: String
     Default: ''
@@ -301,37 +301,37 @@ Conditions:
 Mappings:
   AMI:
     eu-north-1:
-      centos: ami-0b9af355d644500ce
+      centos: ami-0de88f7d3919bff01
     ap-south-1:
-      centos: ami-0d55d5856a64a8918
+      centos: ami-059bf998ba0404d35
     eu-west-3:
-      centos: ami-0dedf3f53f2557591
+      centos: ami-0e8657ef6fd01114c
     eu-west-2:
-      centos: ami-04c86e4a44288c442
+      centos: ami-090e9e25c26e324dc
     eu-west-1:
-      centos: ami-0b34ea9402583cc17
+      centos: ami-05541e1e65a2a6868
     ap-northeast-2:
-      centos: ami-021ab66ea3552f872
+      centos: ami-0636a9282805012e8
     ap-northeast-1:
-      centos: ami-083a80ec77b6c48f5
+      centos: ami-01eb50a7f6ce094b5
     sa-east-1:
-      centos: ami-034441c2a437922b1
+      centos: ami-01b61c53105334e65
     ca-central-1:
-      centos: ami-0fae7558a8c3d4683
+      centos: ami-0fb915e2d57f91cb1
     ap-southeast-1:
-      centos: ami-073d575257d1d42ea
+      centos: ami-083596ab63a3b17e8
     ap-southeast-2:
-      centos: ami-0595dd171f0627906
+      centos: ami-0d2308a0967f38960
     eu-central-1:
-      centos: ami-0ad4e9dfe9704c7a5
+      centos: ami-0d4a4ed0028a0e83d
     us-east-1:
-      centos: ami-093b02d3970c7616d
+      centos: ami-0833fccd37e8e6a76
     us-east-2:
-      centos: ami-0aa5e3a0d1fda1498
+      centos: ami-0f91e3dd35f959c96
     us-west-1:
-      centos: ami-08e6c19ae4c1a2267
+      centos: ami-0d42cc58c730139c2
     us-west-2:
-      centos: ami-01ddf45199de44e71
+      centos: ami-069a77779bcf7529d
 
 Resources:
   ChefRole:
@@ -399,6 +399,7 @@ Resources:
     Condition: CreateChefSecretsBucket
     Type: AWS::S3::Bucket
     DeletionPolicy: Retain
+    UpdateReplacePolicy: Retain
     Properties:
       AccessControl: Private
       VersioningConfiguration:

marketplace.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native Chef Stack for Marketplace v5.1.0
+Description: AWS Native Chef Stack for Marketplace v5.1.1
 
 Parameters:
   # Required Parameters
@@ -198,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.1.0"
+    Default: "5.1.1"
   LogsRetentionInDays:
     Description: Specifies the number of days you want to retain cloudwatch log events.
     Type: Number
@@ -374,6 +374,7 @@ Resources:
   ChefBucket:
     Type: AWS::S3::Bucket
     DeletionPolicy: Retain
+    UpdateReplacePolicy: Retain
     Properties:
       AccessControl: Private
       VersioningConfiguration:

supermarket.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native Supermarket (auto-recovering standalone) v5.1.0
+Description: AWS Native Supermarket (auto-recovering standalone) v5.1.1
 
 Parameters:
   # Required Parameters
@@ -379,7 +379,7 @@ Resources:
       Name: !Sub ${Route53RecordName}.${Route53HostedZone}.
       Comment: !Sub Created by Cloudformation ${AWS::StackName}
       Type: CNAME
-      TTL: '900'
+      TTL: 900
       ResourceRecords:
       - !GetAtt ChefALB.DNSName