From 5f01435a7bce67b957e10615b435556b73390be5 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 12 Sep 2018 21:22:21 -0400 Subject: [PATCH] SO Setup - Fix logic for salt repo is master or eval --- so-setup-network.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/so-setup-network.sh b/so-setup-network.sh index 24c96be9c..fb04a9321 100644 --- a/so-setup-network.sh +++ b/so-setup-network.sh @@ -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