From: Sofer Athlan-Guyot <chem@sathlan.org>
Date: Fri, 19 Aug 2016 17:16:33 +0000 (+0200)
Subject: M/N upgrade sahara-api fails to restart.
X-Git-Tag: opnfv-6.0.0~1590^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0a3cd4dec3dcae5f8bc94e73436c2c76069762f1;p=apex-tripleo-heat-templates.git

M/N upgrade sahara-api fails to restart.

Change-Id: I7a041dab8b1b1edc9c80248e1eef3ce7ab272292
Closes-Bug: 1615056
---

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