diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-26 16:00:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-26 16:00:39 +0000 |
| commit | 533b81df35acd7c2f16cd347cf3167583e870d38 (patch) | |
| tree | 883b180588281871dfb87437fb695ce9e1175aaf | |
| parent | 79af1346fdd99e2186c45b2fd696d4ed6feb91cf (diff) | |
| parent | aae9a45de9a266e5341e0a76165fb909ffe45d21 (diff) | |
Merge "Run packages upgrade on openstack nodes only" into stable/euphrates
| -rwxr-xr-x | mcp/config/states/maas | 4 | ||||
| -rwxr-xr-x | mcp/scripts/salt.sh | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mcp/config/states/maas b/mcp/config/states/maas index 2a0f94809..aa17e9d4d 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -118,6 +118,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 |