Merge pull request #1040 from seth-reeser/develop-catapult

Platform: Remove support for vagrant-aws. RedHat: Update package conf…

Author: seth-reeser

VERSION.yml

@@ -1,5 +1,5 @@
 ---
-version: 4.8.1
+version: 4.8.2
 major:
   description: "Catapult uses Semantic Versioning. During a MAJOR increment, incompatable API changes are made which require a manual upgrade path. Please follow these directions:"
   notice: "NEW MAJOR VERSION OF CATAPULT AVAILABLE"

catapult/catapult.rb

@@ -170,7 +170,7 @@ def Command::format_repo_size(repo_size)
         catapult_exception("There is an issue with Vagrant v1.8.1 on Windows, please install a lesser or greater version.")
       end
       # define required vagrant plugins
-      vagrant_plugins(["highline","vagrant-aws","vagrant-digitalocean","vagrant-hostmanager","vagrant-vbguest","vagrant-winnfsd"]);
+      vagrant_plugins(["highline","vagrant-digitalocean","vagrant-hostmanager","vagrant-vbguest","vagrant-winnfsd"]);
     # others
     elsif (RbConfig::CONFIG['host_os'] =~ /darwin|mac os|linux|solaris|bsd/)
       @environment = :posix
@@ -189,7 +189,7 @@ def Command::format_repo_size(repo_size)
         end
       end
       # define required vagrant plugins
-      vagrant_plugins(["highline","vagrant-aws","vagrant-digitalocean","vagrant-hostmanager","vagrant-vbguest","vagrant-vmware-desktop"]);
+      vagrant_plugins(["highline","vagrant-digitalocean","vagrant-hostmanager","vagrant-vbguest","vagrant-vmware-desktop"]);
     else
       catapult_exception("Cannot detect your operating system, please submit an issue at https://github.com/devopsgroup-io/catapult")
     end

provisioners/redhat/provision.sh

@@ -18,6 +18,10 @@ echo -e "\n\n\n==> INSTALLING MINIMAL DEPENDENCIES"
 
 # install additional repositories
 sudo yum install -y epel-release centos-release-scl
+# update repo urls
+sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/CentOS-*.repo
+sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/CentOS-*.repo
+sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/CentOS-*.repo
 # clean the yum cache directory
 sudo yum clean all -y --verbose
 # update packages

provisioners/redhat/provision_server.sh

@@ -62,9 +62,9 @@ ${output_swap_utilization} \
 # install shyaml
 yum install python -y
 yum install python-pip -y
-sudo pip install pathlib --upgrade
-sudo pip install pyyaml==5.4.1
-sudo pip install shyaml==0.6.2
+sudo pip install pathlib --trusted-host pypi.python.org --upgrade
+sudo pip install pyyaml==5.4.1 --trusted-host pypi.python.org
+sudo pip install shyaml==0.6.2 --trusted-host pypi.python.org
 
 # run server provision
 if [ $(cat "/catapult/provisioners/provisioners.yml" | shyaml get-values-0 redhat.servers.$4.modules) ]; then