summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-17 19:57:02 +0000
committerGerrit Code Review <review@openstack.org>2016-09-17 19:57:02 +0000
commitd8f3e366a0f6d5bbdfd63d9caccb3b352b5ed60e (patch)
treeb2790835a5c10ea12bdb5a0eeb074fe23f57664e
parentdc9c4c2ad9f8ee08d3b97f09641f580bb32c1592 (diff)
parent0a3cd4dec3dcae5f8bc94e73436c2c76069762f1 (diff)
Merge "M/N upgrade sahara-api fails to restart."
-rwxr-xr-xextraconfig/tasks/major_upgrade_controller_pacemaker_1.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh
index 08c49c2c..6d073d86 100755
--- a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh
+++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh
@@ -145,3 +145,5 @@ fi
# Pin messages sent to compute nodes to kilo, these will be upgraded later
crudini --set /etc/nova/nova.conf upgrade_levels compute "$upgrade_level_nova_compute"
+
+crudini --set /etc/sahara/sahara.conf DEFAULT plugins ambari,cdh,mapr,vanilla,spark,storm