From 6ea85bc5bb620a078958f19ec5308ada1f0d0562 Mon Sep 17 00:00:00 2001 From: Jose Luis Franco Arza Date: Wed, 19 Sep 2018 09:53:26 +0200 Subject: [PATCH] Check if openstack-glance-registry is enabled before stopping it. If glance-registry is defined in the service parameters, then during upgrade, it will try to stop it. However, as the service is not enabled the service stop task will fail. This patch checks if the service is enabled before stopping it. And covers the case in which the service might be disabled but still running. Closes-Bug: #1793557 Change-Id: I21d17c05f555b25f709f314f6a19a011a3d10a8d --- .../disabled/glance-registry-disabled.yaml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/puppet/services/disabled/glance-registry-disabled.yaml b/puppet/services/disabled/glance-registry-disabled.yaml index eac8278241..71750b20fb 100644 --- a/puppet/services/disabled/glance-registry-disabled.yaml +++ b/puppet/services/disabled/glance-registry-disabled.yaml @@ -37,9 +37,25 @@ outputs: value: service_name: glance_registry_disabled upgrade_tasks: + - when: step|int == 0 + block: + - name: Check if glance_registry is deployed + command: systemctl is-enabled --quiet openstack-glance-registry + ignore_errors: True + register: glance_registry_enabled_result + - name: Check service openstack-glance-registry is running + shell: systemctl is-active --quiet openstack-glance-registry + register: glance_registry_running_result + ignore_errors: True + - name: Set facts glance_registry_enabled and glance_registry_running + set_fact: + glance_registry_enabled: "{{ glance_registry_enabled_result.rc == 0 }}" + glance_registry_running: "{{ glance_registry_running_result.rc == 0 }}" - name: Stop and disable glance_registry service on upgrade - when: step|int == 1 service: name=openstack-glance-registry state=stopped enabled=no + when: + - step|int == 1 + - glance_registry_enabled|bool or glance_registry_running|bool fast_forward_upgrade_tasks: - when: - step|int == 0