diff options
| author |   Saravanan KR <skramaja@redhat.com> | 2017-02-27 19:16:03 +0530 |
|---|---|---|
| committer | Saravanan KR <skramaja@redhat.com> | 2017-03-01 16:45:22 +0000 |
| commit | 476d15b727b12b750c5a867df1729e8bbd91942d (patch) | |
| tree | 18fc1fdbb13a5e7b5ea66cf1a8dde06ee052ae14 /extraconfig/tasks | |
| parent | d1b67dae40b9bc7cc5d67be0413437f16b4843ba (diff) | |
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 e9a2fdc0afd2a3f1242f397c5f164cf6b43c2669)
Diffstat (limited to 'extraconfig/tasks')
| -rwxr-xr-x | extraconfig/tasks/yum_update.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh index c66dd01f..6bf415b2 100755 --- a/extraconfig/tasks/yum_update.sh +++ b/extraconfig/tasks/yum_update.sh @@ -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 |