diff options
| author |   marios <marios@redhat.com> | 2017-03-28 10:44:41 +0300 |
|---|---|---|
| committer | marios <marios@redhat.com> | 2017-03-31 18:38:33 +0300 |
| commit | 25983882c2f7a8e8f8fb83bd967a67d008a556a4 (patch) | |
| tree | b79f602183225fc9d4edda2a1dd7466f4e5037a9 /extraconfig/tasks/tripleo_upgrade_node.sh | |
| parent | 0e76a20cae6008ae5cf13e7a1d87de154f6e0c40 (diff) | |
Add special case upgrade from openvswitch 2.5.0-14
In [1] we removed the previously used special case upgrade code.
However we have since discovered that for openvswitch 2.5.0-14
the special case is still required with an extra flag to prevent
the restart. This adds the upgrade code back into the minor
update and 'manual upgrade' scripts for compute/swift. The
review at If998704b3c4199bbae8a1d068c31a71763f5c8a2 is adding
this logic for the ansible upgrade steps.
Related-Bug: 1669714
[1] https://review.openstack.org/#/q/59e5f9597eb37f69045e470eb457b878728477d7
Change-Id: I3e5899e2d831b89745b2f37e61ff69dbf83ff595
Diffstat (limited to 'extraconfig/tasks/tripleo_upgrade_node.sh')
| -rw-r--r-- | extraconfig/tasks/tripleo_upgrade_node.sh | 3 |
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 |