openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove the openvswitch special case upgrade code" into stable/newton

This commit is contained in:
Jenkins 2017-03-14 15:18:10 +00:00 committed by Gerrit Code Review
parent 631bc664c9 f8e6b03458
commit 3481a84fa5
6 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extraconfig/tasks/major_upgrade_block_storage.sh
View File

@ -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

6
extraconfig/tasks/major_upgrade_ceph_storage.sh
View File

@ -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

3
extraconfig/tasks/major_upgrade_compute.sh
View File

@ -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

3
extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
View File

@ -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

3
extraconfig/tasks/major_upgrade_object_storage.sh
View File

@ -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

3
extraconfig/tasks/yum_update.sh
View File

@ -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]*")