Version bump for impending release, also fix install of awscli on RHE…

…L again Signed-off-by: Irving Popovetsky <irving@chef.io>
chef-boneyard · Mar 8, 2019 · cc3a852 · cc3a852
1 parent bfbbf9f
commit cc3a852
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/automate.yaml b/automate.yaml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native Automate 2 (auto-recovering standalone) v4.0.0
+Description: AWS Native Automate 2 (auto-recovering standalone) v4.1.0
 
 Parameters:
   # Required Parameters

diff --git a/chef_elasticsearch.yaml b/chef_elasticsearch.yaml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Chef Server Elasticsearch 4.0.0
+Description: Chef Server Elasticsearch v4.1.0
 
 Parameters:
   # Required Parameters

diff --git a/chef_rds.yaml b/chef_rds.yaml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Chef Server PostgreSQL v4.0.0
+Description: Chef Server PostgreSQL v4.1.0
 
 Parameters:
   # Required Parameters

diff --git a/chef_server_ha.yaml b/chef_server_ha.yaml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native Chef Server (auto-scaling HA) v4.0.0
+Description: AWS Native Chef Server (auto-scaling HA) v4.1.0
 
 Parameters:
   # Required Parameters

diff --git a/chef_server_ops_dashboard.yaml b/chef_server_ops_dashboard.yaml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native OpsDashboard for Chef Server v4.0.0
+Description: AWS Native OpsDashboard for Chef Server v4.1.0
 
 Parameters:
   # Required Parameters

diff --git a/files/before.sh b/files/before.sh
@@ -3,11 +3,12 @@
 # Below are needed for RHEL, which lacks niceties like the AWS tools and lvm
 if [[ ! -f /bin/aws ]]; then
   echo ">>> Installing awscli package"
-  yum install -y python-cryptography python-docutils
-  # Thanks Redhat for hiding these in add-on repos, gotta get these from centos
-  rpm -ivh \
-    http://mirror.centos.org/centos/7/os/x86_64/Packages/python-s3transfer-0.1.10-8.el7.noarch.rpm \
-    http://mirror.centos.org/centos/7/updates/x86_64/Packages/awscli-1.14.28-5.el7_5.1.noarch.rpm
+  yum install -y unzip
+  yum erase -y awscli python2-botocore python-s3transfer
+  curl -sOL https://s3.amazonaws.com/aws-cli/awscli-bundle.zip
+  unzip awscli-bundle.zip
+  ./awscli-bundle/install -i /usr/local/aws -b /bin/aws
+  rm -rf awscli-bundle awscli-bundle.zip
 fi
 
 if [[ ! -f /opt/aws/bin/cfn-init ]]; then

diff --git a/main.yaml b/main.yaml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native Chef Stack v4.0.0
+Description: AWS Native Chef Stack v4.1.0
 
 Parameters:
   # Required Parameters

diff --git a/supermarket.yaml b/supermarket.yaml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native Supermarket (auto-recovering standalone) v4.0.0
+Description: AWS Native Supermarket (auto-recovering standalone) v4.1.0
 
 Parameters:
   # Required Parameters