From e9a2fdc0afd2a3f1242f397c5f164cf6b43c2669 Mon Sep 17 00:00:00 2001 From: Saravanan KR Date: Mon, 27 Feb 2017 19:16:03 +0530 Subject: 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 --- extraconfig/tasks/yum_update.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'extraconfig/tasks') 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 -- cgit 1.2.3-korg