Merge "Make the Neutron subnet ipv6_{ra,address}_mode configurable"

[apex-tripleo-heat-templates.git] / extraconfig / tasks / yum_update.sh

diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh
index 3917902..59e4be4 100755 (executable)
--- a/extraconfig/tasks/yum_update.sh
+++ b/extraconfig/tasks/yum_update.sh
@@ -128,6 +128,9 @@ openstack-nova-scheduler"
     # mongod start timeout is higher, setting only stop timeout
     pcs -f $pacemaker_dumpfile resource update mongod op start timeout=370s op  stop timeout=200s
 
+    echo "Making sure rabbitmq has the notify=true meta parameter"
+    pcs -f $pacemaker_dumpfile resource update rabbitmq meta notify=true
+
     echo "Applying new Pacemaker config"
     if ! pcs cluster cib-push $pacemaker_dumpfile; then
         echo "ERROR failed to apply new pacemaker config"
@@ -151,14 +154,14 @@ openstack-nova-scheduler"
     kill $(ps ax | grep -e "radvd.*\.pid\.radvd" | awk '{print $1}') 2>/dev/null || :
 else
     echo "Upgrading openstack-puppet-modules"
-    yum -y update openstack-puppet-modules
+    yum -q -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}
-full_command="yum -y $command $command_arguments"
+full_command="yum -q -y $command $command_arguments"
 echo "Running: $full_command"
 
 result=$($full_command)