7240998433
In I9b1f0eaa0d36a28e20b507bec6a4e9b3af1781ae and
I11fcf688982ceda5eef7afc8904afae44300c2d9 we added a manual step
for upgrading openvswitch in order to specify the --nopostun
as discussed in the bug below.
This change adds a minor update to make this workaround more
robust. It removes any existing rpms that may be around from
an earlier run, and also checks that the rpms installed are
at least newer than the version we are on.
This also refactors the code into a common definition in the
pacemaker_common_functions.sh which is included even for the
heredocs generating upgrade scripts during init. Thanks
Sofer Athlan-Guyot and Jirka Stransky for help with that.
Change-Id: Idc863de7b5a8c116c990ee8c1472cfe377836d37
Related-Bug: 1635205
(cherry picked from commit afcb6e01f3)
36 lines
899 B
Bash
36 lines
899 B
Bash
#!/bin/bash
|
|
#
|
|
# This delivers the compute upgrade script to be invoked as part of the tripleo
|
|
# major upgrade workflow.
|
|
#
|
|
set -eu
|
|
|
|
UPGRADE_SCRIPT=/root/tripleo_upgrade_node.sh
|
|
|
|
cat > $UPGRADE_SCRIPT << ENDOFCAT
|
|
### DO NOT MODIFY THIS FILE
|
|
### This file is automatically delivered to the compute nodes as part of the
|
|
### tripleo upgrades workflow
|
|
|
|
set -eu
|
|
|
|
# pin nova to kilo (messaging +-1) for the nova-compute service
|
|
|
|
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
|
|
|
|
# Due to bug#1640177 we need to restart compute agent
|
|
echo "Restarting openstack ceilometer agent compute"
|
|
systemctl restart openstack-ceilometer-compute
|
|
|
|
ENDOFCAT
|
|
|
|
# ensure the permissions are OK
|
|
chmod 0755 $UPGRADE_SCRIPT
|
|
|