Setup Scripts - Fixing some Centos realted errors

This commit is contained in:
Mike Reeves
2018-10-08 12:14:03 -04:00
parent 3349718383
commit d29eecad12

View File

@@ -247,20 +247,29 @@ detect_os() {
docker_install() { docker_install() {
if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ]; then if [ $OS == 'centos']; then
apt-get update >>~/sosetup.log 2>&1 yum clean expire-cache
apt-get -y install docker-ce >>~/sosetup.log 2>&1 yum -y install yum-utils device-mapper-persistent-data lvm2 openssl
docker_registry yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
echo "Restarting Docker" yum -y update
systemctl restart docker yum -y install docker-ce python-docker
else else
apt-key add $TMP/gpg/docker.pub if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ]; then
add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" apt-get update >>~/sosetup.log 2>&1
apt-get update >>~/sosetup.log 2>&1 apt-get -y install docker-ce >>~/sosetup.log 2>&1
apt-get -y install docker-ce >>~/sosetup.log 2>&1 docker_registry
docker_registry echo "Restarting Docker"
echo "Restarting Docker" systemctl restart docker
systemctl restart docker else
apt-key add $TMP/gpg/docker.pub
add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
apt-get update >>~/sosetup.log 2>&1
apt-get -y install docker-ce >>~/sosetup.log 2>&1
docker_registry
echo "Restarting Docker"
systemctl restart docker
fi
fi fi
} }
@@ -455,10 +464,8 @@ saltify() {
yum clean expire-cache yum clean expire-cache
yum -y install salt-minion yum-utils device-mapper-persistent-data lvm2 openssl yum -y install salt-minion yum-utils device-mapper-persistent-data lvm2 openssl
yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
yum -y update yum -y update
yum -y install docker-ce python-docker
# Nasty hack but required for now # Nasty hack but required for now
if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ]; then if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ]; then
yum -y install salt-master python-m2crypto salt-minion m2crypto yum -y install salt-master python-m2crypto salt-minion m2crypto