Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Re-add NFS backend for Glance"
[apex-tripleo-heat-templates.git]
/
extraconfig
/
tasks
/
major_upgrade_controller_pacemaker_3.sh
diff --git
a/extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh
b/extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh
index
4d72fbd
..
b653c7c
100755
(executable)
--- 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?
# 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
manage_systemd_service start "${service%%-clone}"
check_resource_systemd "${service%%-clone}" started 600
done