diff options
| author |   Pradeep Kilambi <pkilambi@redhat.com> | 2016-10-19 07:32:25 -0400 |
|---|---|---|
| committer | Pradeep Kilambi <pkilambi@redhat.com> | 2016-11-01 08:33:23 -0400 |
| commit | a8e119094f5477c132220e30e7a2e1a9915581a3 (patch) | |
| tree | 92f562abcea1554110a5bfedc08e30735edecc5c /extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh | |
| parent | e60c5377fb4b6dd96a8415b03e88005b3eab603c (diff) | |
Rework gnocchi-upgrade to run in a separate upgrade step
gnocchi when configured with swift will require keystone
to be available to authenticate to migrate to v3. At this
step keystone is not available and gnocchi upgrade fails
with auth error. Instead start apache in step 3, start
apache first and then run gnocchi upgrade in a separate
step and let upgrade happen here.
Closes-Bug: #1634897
Change-Id: I22d02528420e4456f84b80905a7b3a80653fa7b0
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 |