9025a3bc23
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
70 lines
1.8 KiB
Bash
70 lines
1.8 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)
|
|
|
|
# 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
|
|
|
|
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
|
|
|