updates

Author: screeley44

lib/docker-base.sh

@@ -11,7 +11,7 @@ then
   then
     $SUDO yum update >/dev/null 2>&1
     $SUDO yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo >/dev/null 2>&1
-    $SUDO yum install docker-ce -y >/dev/null 2>&1
+    $SUDO yum install docker-ce -y
     # $SUDO yum check-update
     # $SUDO curl -fsSL https://get.docker.com/ | sh >/dev/null 2>&1 
   else

lib/yum-centos-install.sh

@@ -11,9 +11,11 @@ then
   systemctl restart NetworkManager >/dev/null 2>&1
 
   # install pip
-  yum install epel-release -y >/dev/null 2>&1
-  yum install python36 python36-pip python36-devel -y >/dev/null 2>&1
-  yum install jq -y >/dev/null 2>&1
+  yum install python2-pip python3-pip subversion -y >/dev/null 2>&1
+
+  #yum install epel-release -y >/dev/null 2>&1
+  #yum install python36 python36-pip python36-devel -y >/dev/null 2>&1
+  #yum install jq -y >/dev/null 2>&1
 
   if [ "$SETUP_TYPE" == "k8-dev" ]
   then

openshift-installer4.0/centos/SetUpOrigin.sh

@@ -60,28 +60,6 @@ echo " ... ... Installing Base Software"
 source $CONFIG_HOME/../../lib/yum-rhel-4.sh
 echo " ... ... Installing Go-$GOVERSION"
 source $CONFIG_HOME/../../lib/install-go.sh
-#echo " ... ... Installing etcd-$ETCD_VER"
-#source $CONFIG_HOME/../../lib/install-etcd.sh
-echo " ... ... Installing Docker-$DOCKERVER"
-source $CONFIG_HOME/../../lib/docker-base.sh
-
-echo ""
-echo "................................."
-echo "  Configuring Docker"
-echo "................................."
-#if [ "$APP_TYPE" == "origin" ] && [ "$HOSTENV" == "rhel" ]
-#then
-#  source $CONFIG_HOME/../../lib/docker-registry.sh
-#fi
-source $CONFIG_HOME/../../lib/docker-restart.sh
-
-
-# Clone Repos
-echo "................................."
-echo "      Cloning Repos"
-echo "................................."
-source $CONFIG_HOME/../../lib/clone-repos.sh
-echo ""
 
 # Create Profiles
 echo "................................."

openshift-installer4.0/centos/setupvm.config

@@ -57,12 +57,12 @@ WORKER_COUNT=3
 ROOTSIZE=500
 ROOTIOPS=4000
 ROOTTYPE=io1
-MACHINETYPE=c5.9xlarge
+#MACHINETYPE=c5.9xlarge
 #   Other Vars
 CLUSTER_NAME=screeley-c1
 [email protected]
 INSTALL_PASSWORD=changeme
-SSHPATH=/home/ec2-user/.ssh/id_rsa.pub
+SSHPATH=/home/centos/.ssh/id_rsa.pub
 PULLSECRETPATH=/root/pullsecret.json
 #-------------------------------------