diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-05 18:01:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-05 18:01:20 +0000 |
| commit | 5e4a51363b6a5b8ce3171ca2c942113972d1892d (patch) | |
| tree | 7353c264fb473e46a477c9e28f6da036d11c9920 /extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh | |
| parent | ef8bf6379e94ce24cfdb69d51f61bf808b555600 (diff) | |
| parent | 2e6cc07c1a74c2dd7be70568f49834bace499937 (diff) | |
Merge "Adds Environment File for Removing Sahara during M/N upgrade"
Diffstat (limited to 'extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh')
| -rwxr-xr-x | extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh index 4d72fbd8..49c045bc 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 |