diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-01 14:42:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-01 14:42:02 +0000 |
| commit | b889a4b5b3be37ee1dabb60ddce519af84b15b22 (patch) | |
| tree | 3ed727524e5b1abf838923e3ed8a7ec1b775d90d /extraconfig | |
| parent | de1637bdd1f7753f8a20469697f98ef3ddaf4e2b (diff) | |
| parent | e9a2fdc0afd2a3f1242f397c5f164cf6b43c2669 (diff) | |
Merge "Disable exit on error for pacemaker commands for update flow"
Diffstat (limited to 'extraconfig')
| -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 |