Merge "Disable exit on error for pacemaker commands for update flow" into stable/newton
This commit is contained in:
commit
dd9a5e9c8f
|
@ -42,7 +42,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
|
||||
|
|
Loading…
Reference in New Issue