aboutsummaryrefslogtreecommitdiffstats
path: root/extraconfig/tasks/tripleo_upgrade_node.sh
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-01 16:28:19 +0000
committerGerrit Code Review <review@openstack.org>2017-04-01 16:28:20 +0000
commitb07b4cc1a11499c01712a50bcbc5fa1aef5bef33 (patch)
tree67587587822194e8f812c072bec41fdd377c1289 /extraconfig/tasks/tripleo_upgrade_node.sh
parent2f9a76c5a21ab2ed63b693072604f18961e4b213 (diff)
parent25983882c2f7a8e8f8fb83bd967a67d008a556a4 (diff)
Merge "Add special case upgrade from openvswitch 2.5.0-14"
Diffstat (limited to 'extraconfig/tasks/tripleo_upgrade_node.sh')
-rw-r--r--extraconfig/tasks/tripleo_upgrade_node.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/extraconfig/tasks/tripleo_upgrade_node.sh b/extraconfig/tasks/tripleo_upgrade_node.sh
index 24211ab0..a5a312dc 100644
--- a/extraconfig/tasks/tripleo_upgrade_node.sh
+++ b/extraconfig/tasks/tripleo_upgrade_node.sh
@@ -28,12 +28,15 @@ SCRIPT_NAME=$(basename $0)
$(declare -f log_debug)
$(declare -f manage_systemd_service)
$(declare -f systemctl_swift)
+$(declare -f special_case_ovs_upgrade_if_needed)
# pin nova messaging +-1 for the nova-compute service
if [[ -n \$NOVA_COMPUTE ]]; then
crudini --set /etc/nova/nova.conf upgrade_levels compute auto
fi
+special_case_ovs_upgrade_if_needed
+
if [[ -n \$SWIFT_STORAGE ]]; then
systemctl_swift stop
fi