Merge pull request #10096 from Security-Onion-Solutions/salt3006rc3

only install salt-minion on non manager
This commit is contained in:
Josh Patterson
2023-04-06 11:07:26 -04:00
committed by GitHub

View File

@@ -2030,19 +2030,16 @@ saltify() {
fi
if [[ $is_rocky ]]; then
# THIS IS A TEMP HACK
#logCmd "dnf -y install securityonion-salt python3-audit python3-libsemanage python3-policycoreutils python3-setools python3-setuptools python3-chardet python3-idna python3-pysocks python3-requests python3-urllib3 python3-websocket-client python3-docker"
if [[ $waitforstate ]]; then
# install all for a manager
logCmd "dnf -y install salt salt-master salt-minion"
else
# We just need the minion
logCmd "dnf -y install salt salt-minion"
fi
logCmd "mkdir -p /etc/salt/minion.d"
logCmd "salt-pip install docker --no-index --only-binary=:all: --find-links files/salt_module_deps/docker/"
logCmd "salt-pip install pymysql --no-index --only-binary=:all: --find-links files/salt_module_deps/pymysql/"
#if [[ $waitforstate ]]; then
# # Since this is a salt master so let's install it
# logCmd ""
#else
# # We just need the minion
# logCmd "dnf -y install salt-minion"
#fi
fi
}