summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmcp/config/states/maas4
-rwxr-xr-xmcp/scripts/salt.sh3
2 files changed, 3 insertions, 4 deletions
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index de9d699b9..e184e9120 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -115,6 +115,6 @@ wait_for 10 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp |
wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \
$(awk 'NR==1{print $2}' "$(eval echo "~${SUDO_USER}/.ssh/authorized_keys")")"
-# Get the latest packages
-wait_for 10 "! salt '*' pkg.upgrade refresh=False | " \
+# Get the latest packages for openstack nodes
+wait_for 10 "! salt -C 'E@^(?!cfg01|mas01|kvm).*' pkg.upgrade refresh=False | " \
"tee /dev/stderr | fgrep -q 'Not connected'"
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index f184bcde6..4effa6b4f 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -60,8 +60,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END
salt -C 'I@salt:master' state.sls linux
salt -C '* and not cfg01*' state.sls linux
+ salt -C '* and not cfg01*' pkg.upgrade refresh=False
salt '*' state.sls ntp
-
- salt '*' pkg.upgrade refresh=False
SALT_INSTALL_END