25983882c2
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
73 lines
1.9 KiB
Bash
73 lines
1.9 KiB
Bash
#!/bin/bash
|
|
#
|
|
# This delivers the operator driven upgrade script to be invoked as part of
|
|
# the tripleo major upgrade workflow. The utility 'upgrade-non-controller.sh'
|
|
# is used from the undercloud to invoke the /root/tripleo_upgrade_node.sh
|
|
#
|
|
set -eu
|
|
|
|
UPGRADE_SCRIPT=/root/tripleo_upgrade_node.sh
|
|
|
|
cat > $UPGRADE_SCRIPT << ENDOFCAT
|
|
### DO NOT MODIFY THIS FILE
|
|
### This file is automatically delivered to those nodes where the
|
|
### disable_upgrade_deployment flag is set in roles_data.yaml.
|
|
|
|
set -eu
|
|
NOVA_COMPUTE=""
|
|
if hiera -c /etc/puppet/hiera.yaml service_names | grep nova_compute ; then
|
|
NOVA_COMPUTE="true"
|
|
fi
|
|
SWIFT_STORAGE=""
|
|
if hiera -c /etc/puppet/hiera.yaml service_names | grep swift_storage ; then
|
|
SWIFT_STORAGE="true"
|
|
fi
|
|
|
|
DEBUG="true"
|
|
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
|
|
|
|
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
|
|
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
|
|
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
|
|
chmod 0755 $UPGRADE_SCRIPT
|
|
|