diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-21 10:39:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-21 10:39:58 +0000 |
| commit | 3bb80a3bbeb3547db78ac8ceb00c9a301d544d26 (patch) | |
| tree | 7175a501b4b573620bcac612c3eb7774fc405f0c /extraconfig/tasks | |
| parent | 557b0214162ac60b65db93deb4af71dee14a28dd (diff) | |
| parent | 476d15b727b12b750c5a867df1729e8bbd91942d (diff) | |
Merge "Disable exit on error for pacemaker commands for update flow" into stable/ocata
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 f8ab10c2..4c87373e 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 |