openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Disable exit on error for pacemaker commands for update flow" into stable/ocata

This commit is contained in:
Jenkins 2017-03-21 10:39:58 +00:00 committed by Gerrit Code Review
parent 557b021416 476d15b727
commit 3bb80a3bbe
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extraconfig/tasks/yum_update.sh
View File

@ -47,7 +47,10 @@ if [[ "$list_updates" == "" ]]; then
exit 0
fi
pacemaker_status=$(systemctl is-active pacemaker || :)
pacemaker_status=""
if hiera -c /etc/puppet/hiera.yaml service_names | grep -q pacemaker; then
pacemaker_status=$(systemctl is-active pacemaker)
fi
# Fix the redis/rabbit resource start/stop timeouts. See https://bugs.launchpad.net/tripleo/+bug/1633455
# and https://bugs.launchpad.net/tripleo/+bug/1634851