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

diff --git a/extraconfig/tasks/major_upgrade_compute.sh b/extraconfig/tasks/major_upgrade_compute.sh
index 2f19d57..78628c8 100644 (file)
--- 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 ff73a9a..dcd4be9 100755 (executable)
--- 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