openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Disable exit on error for pacemaker commands for update flow 

Package update fails on compute node, when yum_update checks for
pacemaker status via systemctl command. Because exit on error (-e)
option has been enabled recently, this issue is happening. Fixing
by, executing the command only on nodes where pacemaker is enabled.
Closes-Bug: #1668266

Change-Id: I2aae4e2fdfec526c835f8967b54e1db3757bca17
(cherry picked from commit e9a2fdc0af)
This commit is contained in:
Saravanan KR 2017-02-27 19:16:03 +05:30
parent d1b67dae40
commit 476d15b727
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