aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Stransky <jistr@redhat.com>2016-02-29 17:44:37 +0100
committerJiri Stransky <jistr@redhat.com>2016-03-02 12:11:36 +0100
commitf496aa225c2f12e2f8da80c74d4b511e0e6e2bf0 (patch)
tree76819a250092c4d92d176bb30cfc69e3ea480024
parent07ce6e053cd900f782c5c6b391decd0c49ee45cc (diff)
Upgrades: install zaqarclient
Old overcloud images don't have python-zaqarclient installed, and new overclouds' os-collect-config are configured with Zaqar support. This together means that on upgrade we need to install python-zaqarclient, otherwise os-collect-config will be restarted during yum update and crash due to trying to import missing Python module from zaqarclient. Change-Id: I3e875e14cb60b1b78aec0d9ddc412ccf865abd01
-rw-r--r--extraconfig/tasks/major_upgrade_compute.sh2
-rwxr-xr-xextraconfig/tasks/major_upgrade_controller_pacemaker_1.sh1
2 files changed, 3 insertions, 0 deletions
diff --git a/extraconfig/tasks/major_upgrade_compute.sh b/extraconfig/tasks/major_upgrade_compute.sh
index 2f19d573..78628c8c 100644
--- a/extraconfig/tasks/major_upgrade_compute.sh
+++ b/extraconfig/tasks/major_upgrade_compute.sh
@@ -15,6 +15,8 @@ cat > $UPGRADE_SCRIPT << ENDOFCAT
# pin nova to kilo (messaging +-1) for the nova-compute service
crudini --set /etc/nova/nova.conf upgrade_levels compute $upgrade_level_nova_compute
+
+yum -y install python-zaqarclient # needed for os-collect-config
yum -y update
ENDOFCAT
diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh
index ff73a9a2..dcd4be95 100755
--- a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh
+++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh
@@ -46,6 +46,7 @@ while systemctl is-active pacemaker; do
fi
done
+yum -y install python-zaqarclient # needed for os-collect-config
yum -y -q update
# Pin messages sent to compute nodes to kilo, these will be upgraded later