openstack/tripleo-heat-templates
Code Issues Proposed changes

Add explicit swift check to tripleo_upgrade_node.sh

Browse Source 
And change the conditional to use hiera instead.

Change-Id: Icf91dd91c0ab04e7919172fcfd130183bfd427b4
This commit is contained in:
marios 2017-02-15 16:20:36 +02:00
parent 237cd2004a
commit d8e75b220e
1 changed files with 11 additions and 4 deletions

15
extraconfig/tasks/tripleo_upgrade_node.sh

@ -15,9 +15,13 @@ cat > $UPGRADE_SCRIPT << ENDOFCAT
set -eu set -eu
NOVA_COMPUTE="" NOVA_COMPUTE=""
if systemctl show 'openstack-nova-compute' --property ActiveState | grep '\bactive\b'; then if hiera -c /etc/puppet/hiera.yaml service_names | grep nova_compute ; then
NOVA_COMPUTE="true" NOVA_COMPUTE="true"
fi fi
SWIFT_STORAGE=""
if hiera -c /etc/puppet/hiera.yaml service_names | grep swift_storage ; then
SWIFT_STORAGE="true"
fi
DEBUG="true" DEBUG="true"
SCRIPT_NAME=$(basename $0) SCRIPT_NAME=$(basename $0)
@ -34,10 +38,13 @@ $(declare -f special_case_ovs_upgrade_if_needed)
special_case_ovs_upgrade_if_needed special_case_ovs_upgrade_if_needed
yum -y install python-zaqarclient # needed for os-collect-config yum -y install python-zaqarclient # needed for os-collect-config
systemctl_swift stop if [[ -n \$SWIFT_STORAGE ]]; then
systemctl_swift stop
fi
yum -y update yum -y update
systemctl_swift start if [[ -n \$SWIFT_STORAGE ]]; then
systemctl_swift start
fi
# Due to bug#1640177 we need to restart compute agent # Due to bug#1640177 we need to restart compute agent
if [[ -n \$NOVA_COMPUTE ]]; then if [[ -n \$NOVA_COMPUTE ]]; then
echo "Restarting openstack ceilometer agent compute" echo "Restarting openstack ceilometer agent compute"