Remove the openvswitch special case upgrade code
Removed from the tripleo_upgrade_node.sh (major upgrade) & yum_update.sh
(minor update). 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 with no drama.
Also adds a 'complete' message, some extra debug echo for logs
and removes the python-zaqarclient install no longer needed
Closes-Bug: 1669714
Change-Id: Icd1517bcade36781fa0da21d045ffd9ec68efc38
(cherry picked from commit 9025a3bc23
)
This commit is contained in:
parent
9c27e4986c
commit
59e5f9597e
|
@ -34,31 +34,34 @@ if [[ -n \$NOVA_COMPUTE ]]; then
|
|||
crudini --set /etc/nova/nova.conf upgrade_levels compute auto
|
||||
fi
|
||||
|
||||
$(declare -f special_case_ovs_upgrade_if_needed)
|
||||
special_case_ovs_upgrade_if_needed
|
||||
|
||||
yum -y install python-zaqarclient # needed for os-collect-config
|
||||
if [[ -n \$SWIFT_STORAGE ]]; then
|
||||
systemctl_swift stop
|
||||
fi
|
||||
|
||||
yum -y update
|
||||
|
||||
if [[ -n \$SWIFT_STORAGE ]]; then
|
||||
systemctl_swift start
|
||||
fi
|
||||
# Due to bug#1640177 we need to restart compute agent
|
||||
if [[ -n \$NOVA_COMPUTE ]]; then
|
||||
echo "Restarting openstack ceilometer agent compute"
|
||||
log_debug "Restarting openstack ceilometer agent compute"
|
||||
systemctl restart openstack-ceilometer-compute
|
||||
fi
|
||||
|
||||
# Apply puppet manifest to converge just right after the ${ROLE} upgrade
|
||||
$(declare -f run_puppet)
|
||||
for step in 1 2 3 4 5 6; do
|
||||
log_debug "Running puppet step \$step for ${ROLE}"
|
||||
if ! run_puppet /root/${ROLE}_puppet_config.pp ${ROLE} \${step}; then
|
||||
echo "Puppet failure at step \${step}"
|
||||
log_debug "Puppet failure at step \${step}"
|
||||
exit 1
|
||||
fi
|
||||
log_debug "Completed puppet step \$step"
|
||||
done
|
||||
|
||||
log_debug "TripleO upgrade run completed."
|
||||
|
||||
ENDOFCAT
|
||||
|
||||
# ensure the permissions are OK
|
||||
|
|
|
@ -67,9 +67,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]*")
|
||||
|
|
Loading…
Reference in New Issue