Merge "upgrade: move removal of services at step 3 (leftovers)"

docker/services/haproxy.yaml

@@ -279,6 +279,8 @@ outputs:
             - name: Stop and disable haproxy service
               when: haproxy_enabled|bool
               service: name=haproxy state=stopped enabled=no
+        - when: step|int == 3
+          block:
             - name: Set fact for removal of HAproxy package
               set_fact:
                 remove_haproxy_package: {get_param: UpgradeRemoveUnusedPackages}

docker/services/ironic-api.yaml

@@ -203,6 +203,8 @@ outputs:
                 - ironic_httpd_enabled|bool
                 - httpd_running|bool
               service: name=httpd state=stopped enabled=no
+        - when: step|int == 3
+          block:
             - name: Set fact for removal of openstack-ironic-api package
               set_fact:
                 remove_ironic_api_package: {get_param: UpgradeRemoveUnusedPackages}

docker/services/ironic-conductor.yaml

@@ -236,6 +236,8 @@ outputs:
             - name: Stop and disable ironic_conductor service
               when: ironic_conductor_enabled|bool
               service: name=openstack-ironic-conductor state=stopped enabled=no
+        - when: step|int == 3
+          block:
             - name: Set fact for removal of openstack-ironic-conductor package
               set_fact:
                 remove_ironic_conductor_package: {get_param: UpgradeRemoveUnusedPackages}

docker/services/keepalived.yaml

@@ -36,6 +36,10 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  UpgradeRemoveUnusedPackages:
+    default: false
+    description: Remove package if the service is being disabled during upgrade
+    type: boolean
 
 resources:
 
@@ -133,3 +137,12 @@ outputs:
             - name: Stop and disable keepalived service
               service: name=keepalived state=stopped enabled=no
               when: keepalived_enabled|bool
+        - when: step|int == 3
+          block:
+            - name: Set fact for removal of Keepalived package
+              set_fact:
+                remove_keepalived_package: {get_param: UpgradeRemoveUnusedPackages}
+            - name: Remove Keepalived package if operator requests it
+              package: name=keepalived state=removed
+              ignore_errors: True
+              when: remove_keepalived_package|bool

docker/services/keystone.yaml

@@ -259,6 +259,8 @@ outputs:
               file:
                 path: /var/spool/cron/keystone
                 state: absent
+        - when: step|int == 3
+          block:
             - name: Set fact for removal of openstack-keystone package
               set_fact:
                 remove_keystone_package: {get_param: UpgradeRemoveUnusedPackages}

docker/services/mistral-api.yaml

@@ -211,6 +211,8 @@ outputs:
               when:
                 - mistral_httpd_enabled|bool
                 - httpd_running|bool
+        - when: step|int == 3
+          block:
             - name: Set fact for removal of openstack-mistral-api package
               set_fact:
                 remove_mistral_api_package: {get_param: UpgradeRemoveUnusedPackages}

docker/services/mistral-engine.yaml

@@ -146,6 +146,8 @@ outputs:
             - name: Stop and disable mistral_engine service
               when: mistral_engine_enabled|bool
               service: name=openstack-mistral-engine state=stopped enabled=no
+        - when: step|int == 3
+          block:
             - name: Set fact for removal of openstack-mistral-engine package
               set_fact:
                 remove_mistral_engine_package: {get_param: UpgradeRemoveUnusedPackages}

docker/services/mistral-event-engine.yaml

@@ -146,6 +146,8 @@ outputs:
             - name: Stop and disable mistral_event_engine service
               when: mistral_event_engine_enabled|bool
               service: name=openstack-mistral-event-engine state=stopped enabled=no
+        - when: step|int == 3
+          block:
             - name: Set fact for removal of openstack-mistral-event-engine package
               set_fact:
                 remove_mistral_event_engine_package: {get_param: UpgradeRemoveUnusedPackages}

docker/services/mistral-executor.yaml

@@ -162,6 +162,8 @@ outputs:
             - name: Stop and disable mistral_executor service
               when: mistral_executor_enabled|bool
               service: name=openstack-mistral-executor state=stopped enabled=no
+        - when: step|int == 3
+          block:
             - name: Set fact for removal of openstack-mistral-executor package
               set_fact:
                 remove_mistral_executor_package: {get_param: UpgradeRemoveUnusedPackages}

docker/services/zaqar.yaml

@@ -229,6 +229,8 @@ outputs:
                 - zaqar_httpd_enabled|bool
                 - httpd_running|bool
               service: name=httpd state=stopped enabled=no
+        - when: step|int == 3
+          block:
             - name: Set fact for removal of openstack-zaqar package
               set_fact:
                 remove_zaqar_package: {get_param: UpgradeRemoveUnusedPackages}