X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=extraconfig%2Ftasks%2Fmajor_upgrade_controller_pacemaker_3.sh;h=b653c7c7503340170997b7fd9e794233debe5c23;hb=0f41197e6aeded5d5d2a0c3f9f0cd1a0d709d087;hp=4d72fbd80b430aba6e359916544bae958046f265;hpb=4cdc4fc67361b175d90f6b2807c26b5ee78c8282;p=apex-tripleo-heat-templates.git

diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh
index 4d72fbd8..b653c7c7 100755
--- a/extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh
+++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh
@@ -16,7 +16,11 @@ systemctl_swift start
 # We need to start the systemd services we explicitely stopped at step _1.sh
 # FIXME: Should we let puppet during the convergence step do the service enabling or
 # should we add it here?
-for service in $(services_to_migrate); do
+services=$(services_to_migrate)
+if [[ ${keep_sahara_services_on_upgrade} =~ [Ff]alse ]] ; then
+    services=${services%%openstack-sahara*}
+fi
+for service in $services; do
     manage_systemd_service start "${service%%-clone}"
     check_resource_systemd "${service%%-clone}" started 600
 done