aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-05 20:16:19 +0000
committerGerrit Code Review <review@openstack.org>2017-05-05 20:16:19 +0000
commit5fc8d234dd962b641c4daeae241b98c63f3fa84d (patch)
tree30445f20bac405c31f6b8f942fe18fd98392b861
parent574617d007b02f98b2ac9b7e853cf4fd266fe085 (diff)
parent2244290424ffa7781fb5b64688908c218cd10ecd (diff)
Merge "Fix up pacemaker_status test in yum_update.sh"
-rwxr-xr-xextraconfig/tasks/yum_update.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh
index 83d6d8d6..cb9cc5b1 100755
--- a/extraconfig/tasks/yum_update.sh
+++ b/extraconfig/tasks/yum_update.sh
@@ -39,7 +39,8 @@ fi
touch "$timestamp_file"
pacemaker_status=""
-if hiera -c /etc/puppet/hiera.yaml service_names | grep -q pacemaker; then
+# We include word boundaries in order to not match pacemaker_remote
+if hiera -c /etc/puppet/hiera.yaml service_names | grep -q '\bpacemaker\b'; then
pacemaker_status=$(systemctl is-active pacemaker)
fi
@@ -78,7 +79,6 @@ elif [[ "$check_update_exit" != "100" ]]; then
exit 0
fi
-
# special case https://bugs.launchpad.net/tripleo/+bug/1635205 +bug/1669714
special_case_ovs_upgrade_if_needed