diff options
author | 2016-01-21 10:02:53 +0000 | |
---|---|---|
committer | 2016-01-21 10:02:53 +0000 | |
commit | f5cbeafffd0c0b7ba0bf38d04c4c77b64628f191 (patch) | |
tree | 8294bdd3b59b9892290f5979a3146b913af4204a | |
parent | a2300bc50e4675bbd6d892d40dd14221ebbf0c5d (diff) | |
parent | 4923ce769c228a3e094bd7aa96907a7ea9c49e9f (diff) |
Merge "Let Puppet update all packages on non-controllers"
-rwxr-xr-x | extraconfig/tasks/yum_update.sh | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh index c6313d9d..39179024 100755 --- a/extraconfig/tasks/yum_update.sh +++ b/extraconfig/tasks/yum_update.sh @@ -150,11 +150,11 @@ openstack-nova-scheduler" kill $(ps ax | grep -e "keepalived.*\.pid-vrrp" | awk '{print $1}') 2>/dev/null || : kill $(ps ax | grep -e "radvd.*\.pid\.radvd" | awk '{print $1}') 2>/dev/null || : else - echo "Excluding upgrading packages that are handled by config management tooling" - command_arguments="$command_arguments --skip-broken" - for exclude in $(cat /var/lib/tripleo/installed-packages/* | sort -u); do - command_arguments="$command_arguments --exclude $exclude" - done + echo "Upgrading openstack-puppet-modules" + yum -y update openstack-puppet-modules + echo "Upgrading other packages is handled by config management tooling" + echo -n "true" > $heat_outputs_path.update_managed_packages + exit 0 fi command=${command:-update} @@ -199,9 +199,6 @@ if [[ "$pacemaker_status" == "active" ]] ; then fi pcs status - -else - echo -n "true" > $heat_outputs_path.update_managed_packages fi echo "Finished yum_update.sh on server $deploy_server_id at `date`" |