SO Setup - Fix logic for salt repo is master or eval

This commit is contained in:
Mike Reeves
2018-09-12 21:22:21 -04:00
parent 0ab889b743
commit 5f01435a7b

View File

@@ -409,13 +409,18 @@ saltify() {
if [ $OS == 'centos' ]; then
ADDUSER=adduser
if [ $MASTERUPDATES == 'MASTER' ]; then
yum -y install wget
export http_proxy=http://$MSRV:3142; wget -O $TMP/salt-repo-latest-2.el7.noarch.rpm http://repo.saltstack.com/yum/redhat/salt-repo-latest-2.el7.noarch.rpm
yum -y install $TMP/salt-repo-latest-2.el7.noarch.rpm
else
if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ]; then
yum -y install https://repo.saltstack.com/yum/redhat/salt-repo-latest-2.el7.noarch.rpm
else
if [ $MASTERUPDATES == 'MASTER' ]; then
yum -y install wget
export http_proxy=http://$MSRV:3142; wget -O $TMP/salt-repo-latest-2.el7.noarch.rpm http://repo.saltstack.com/yum/redhat/salt-repo-latest-2.el7.noarch.rpm
yum -y install $TMP/salt-repo-latest-2.el7.noarch.rpm
else
yum -y install https://repo.saltstack.com/yum/redhat/salt-repo-latest-2.el7.noarch.rpm
fi
fi
fi
yum clean expire-cache
yum -y install salt-minion yum-utils device-mapper-persistent-data lvm2 openssl