aboutsummaryrefslogtreecommitdiffstats
path: root/extraconfig/tasks/tripleo_upgrade_node.sh
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-03 09:56:40 +0000
committerGerrit Code Review <review@openstack.org>2017-04-03 09:56:40 +0000
commit96fc0659c3736f752927a4bce3550678bf3bb44e (patch)
tree2fb839460c3a457949f616e368f6db8ebf245a11 /extraconfig/tasks/tripleo_upgrade_node.sh
parentf8d229285bf4a4786e6adf0f60e1a8046cf46972 (diff)
parent2e7c850fa1d78f2b21e5017e03b15a066a0666da (diff)
Merge "Add special case upgrade from openvswitch 2.5.0-14" into stable/ocata
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