diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-11-03 17:28:58 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-11-03 17:28:58 +0000 |
commit | 2df74cc8295bcc96add61d559068153056ba3e5d (patch) | |
tree | 7d2d4ffe20a9cb4f05b99fdf93502af06945756f /extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh | |
parent | d73f663f66108eb61575d9f15678b7c6649a13ee (diff) | |
parent | a8e119094f5477c132220e30e7a2e1a9915581a3 (diff) |
Merge "Rework gnocchi-upgrade to run in a separate upgrade step"
Diffstat (limited to 'extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh')
-rwxr-xr-x | extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh index b653c7c7..d2cb9553 100755 --- a/extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh +++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh @@ -9,18 +9,9 @@ check_resource redis started 600 start_or_enable_service openstack-cinder-volume check_resource openstack-cinder-volume started 600 +# start httpd so keystone is available for gnocchi +# upgrade to run. +systemctl start httpd # Swift isn't controled by pacemaker 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? -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 |