openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix up pacemaker_status test in yum_update.sh"

This commit is contained in:
Jenkins 2017-05-05 20:16:19 +00:00 committed by Gerrit Code Review
parent 574617d007 2244290424
commit 5fc8d234dd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extraconfig/tasks/yum_update.sh
View File

@ -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