openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Adds check for existing yum process during the legacy minor update"

Browse Source
This commit is contained in:
Jenkins 2017-07-14 00:33:58 +00:00 committed by Gerrit Code Review
commit c031108b9a
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extraconfig/tasks/pacemaker_common_functions.sh
View File

@ -371,3 +371,15 @@ function fixup_wrong_ipv6_vip {
fi fi
) )
} }
# https://bugs.launchpad.net/tripleo/+bug/1704131 guard against yum update
# waiting for an existing process until the heat stack time out
function check_for_yum_lock {
if [[ -f /var/run/yum.pid ]] ; then
ERR="ERROR existing yum.pid detected - can't continue! Please ensure
there is no other package update process for the duration of the minor update
worfklow. Exiting."
echo $ERR
exit 1
fi
}

4
extraconfig/tasks/yum_update.sh
View File

@ -93,6 +93,7 @@ if [[ "$pacemaker_status" == "active" ]] ; then
fi fi
else else
echo "Upgrading openstack-puppet-modules and its dependencies" echo "Upgrading openstack-puppet-modules and its dependencies"
check_for_yum_lock
yum -q -y update openstack-puppet-modules yum -q -y update openstack-puppet-modules
yum deplist openstack-puppet-modules | awk '/dependency/{print $2}' | xargs yum -q -y update yum deplist openstack-puppet-modules | awk '/dependency/{print $2}' | xargs yum -q -y update
echo "Upgrading other packages is handled by config management tooling" echo "Upgrading other packages is handled by config management tooling"
@ -102,8 +103,9 @@ fi
command=${command:-update} command=${command:-update}
full_command="yum -q -y $command $command_arguments" full_command="yum -q -y $command $command_arguments"
echo "Running: $full_command"
echo "Running: $full_command"
check_for_yum_lock
result=$($full_command) result=$($full_command)
return_code=$? return_code=$?
echo "$result" echo "$result"