Remove the openvswitch special case upgrade code

Removed from the major upgrade and minor update scripts. The
workaround is no longer needed and in fact has the opposite
effect killing connectitivity to the node. The 'normal' yum
update on nodes delivers the latest openvswitch 2.6.1 OK.

Closes-Bug: 1669714
Change-Id: I5d0ae4e76a2c61faceddc444f91b09aef52b62f0
(cherry picked from commit 59e5f9597e)

extraconfig/tasks/major_upgrade_block_storage.sh

@@ -4,8 +4,5 @@
 #
 set -eu
 
-# Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1635205
-special_case_ovs_upgrade_if_needed
-
 yum -y install python-zaqarclient  # needed for os-collect-config
 yum -y -q update

extraconfig/tasks/major_upgrade_ceph_storage.sh

@@ -8,9 +8,7 @@ set -o pipefail
 
 UPGRADE_SCRIPT=/root/tripleo_upgrade_node.sh
 
-declare -f special_case_ovs_upgrade_if_needed > $UPGRADE_SCRIPT
-# use >> here so we don't lose the declaration we added above
-cat >> $UPGRADE_SCRIPT << 'ENDOFCAT'
+cat > $UPGRADE_SCRIPT << 'ENDOFCAT'
 #!/bin/bash
 ### DO NOT MODIFY THIS FILE
 ### This file is automatically delivered to the ceph-storage nodes as part of the
@@ -51,8 +49,6 @@ timeout 60 bash -c "while kill -0 ${OSD_PIDS} 2> /dev/null; do
   sleep 2;
 done"
 
-special_case_ovs_upgrade_if_needed
-
 # Update (Ceph to Jewel)
 yum -y install python-zaqarclient  # needed for os-collect-config
 yum -y update

extraconfig/tasks/major_upgrade_compute.sh

@@ -18,9 +18,6 @@ set -eu
 
 crudini  --set /etc/nova/nova.conf upgrade_levels compute $upgrade_level_nova_compute
 
-$(declare -f special_case_ovs_upgrade_if_needed)
-special_case_ovs_upgrade_if_needed
-
 yum -y install python-zaqarclient  # needed for os-collect-config
 yum -y update
 

extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh

@@ -99,9 +99,6 @@ if [ $DO_MYSQL_UPGRADE -eq 1 ]; then
     mv /var/lib/mysql $MYSQL_TEMP_UPGRADE_BACKUP_DIR
 fi
 
-# Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1635205
-special_case_ovs_upgrade_if_needed
-
 yum -y install python-zaqarclient  # needed for os-collect-config
 yum -y -q update
 

extraconfig/tasks/major_upgrade_object_storage.sh

@@ -23,9 +23,6 @@ function systemctl_swift {
     done
 }
 
-$(declare -f special_case_ovs_upgrade_if_needed)
-special_case_ovs_upgrade_if_needed
-
 systemctl_swift stop
 
 yum -y install python-zaqarclient  # needed for os-collect-config

extraconfig/tasks/yum_update.sh

@@ -65,9 +65,6 @@ if [[ "$pacemaker_status" == "active" && \
     fi
 fi
 
-# Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1635205
-special_case_ovs_upgrade_if_needed
-
 if [[ "$pacemaker_status" == "active" ]] ; then
     echo "Pacemaker running, stopping cluster node and doing full package update"
     node_count=$(pcs status xml | grep -o "<nodes_configured.*/>" | grep -o 'number="[0-9]*"' | grep -o "[0-9]*")