aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-02 15:39:24 +0000
committerGerrit Code Review <review@openstack.org>2016-03-02 15:39:24 +0000
commita54e0b973b296204139d6ff2816902ee96f0b309 (patch)
treebcea8a17eae8c26f2ed309c578c5bae565579c2e
parent8ecfaf4659a2dc2d3b8c3ff1ad11790f5835b94a (diff)
parentf496aa225c2f12e2f8da80c74d4b511e0e6e2bf0 (diff)
Merge "Upgrades: install zaqarclient"
-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