Merge "FFU: Introduce Aodh fast-forward-upgrade tasks" into stable/queens

docker/services/aodh-api.yaml

@@ -202,3 +202,52 @@ outputs:
             - remove_aodh_api_package|bool
       metadata_settings:
         get_attr: [AodhApiPuppetBase, role_data, metadata_settings]
+      fast_forward_upgrade_tasks:
+        - name: Check for aodh running under apache
+          tags: common
+          shell: "httpd -t -D DUMP_VHOSTS | grep -q aodh_wsgi"
+          ignore_errors: true
+          register: aodh_httpd_enabled_result
+          when:
+            - step|int == 0
+            - release == 'ocata'
+        - name: Set fact aodh_httpd_enabled
+          set_fact:
+            aodh_httpd_enabled: "{{ aodh_httpd_enabled_result.rc == 0 }}"
+          when:
+            - step|int == 0
+            - release == 'ocata'
+        - name: Check if httpd is running
+          ignore_errors: True
+          command: systemctl is-active --quiet httpd
+          register: httpd_running_result
+          when:
+            - step|int == 0
+            - release == 'ocata'
+            - httpd_running is undefined
+        - name: Set fact httpd_running if undefined
+          set_fact:
+            httpd_running: "{{ httpd_running_result.rc == 0 }}"
+          when:
+            - step|int == 0
+            - release == 'ocata'
+            - httpd_running is undefined
+        - name: Stop and disable aodh (under httpd)
+          service: name=httpd state=stopped enabled=no
+          when:
+            - step|int == 1
+            - release == 'ocata'
+            - aodh_httpd_enabled|bool
+            - httpd_running|bool
+        - name: Aodh package update
+          yum: name=openstack-aodh* state=latest
+          when:
+            - step|int == 6
+            - is_bootstrap_node|bool
+            - aodh_httpd_enabled|bool
+        - name: aodh db sync
+          command: aodh-dbsync
+          when:
+            - step|int == 8
+            - is_bootstrap_node|bool
+            - aodh_httpd_enabled|bool

docker/services/aodh-evaluator.yaml

@@ -149,3 +149,23 @@ outputs:
           when:
             - step|int == 2
             - remove_aodh_evaluator_package|bool
+      fast_forward_upgrade_tasks:
+        - name: FFU check if openstack-aodh-evaluator is deployed
+          command: systemctl is-enabled --quiet openstack-aodh-evaluator
+          ignore_errors: True
+          register: aodh_evaluator_enabled_result
+          when:
+            - step|int == 0
+            - release == 'ocata'
+        - name: Set fact aodh_evaluator_enabled
+          set_fact:
+            aodh_evaluator_enabled: "{{ aodh_evaluator_enabled_result.rc == 0 }}"
+          when:
+            - step|int == 0
+            - release == 'ocata'
+        - name: FFU stop and disable openstack-aodh-evaluator service
+          service: name=openstack-aodh-evaluator state=stopped enabled=no
+          when:
+            - step|int == 1
+            - release == 'ocata'
+            - aodh_evaluator_enabled|bool

docker/services/aodh-listener.yaml

@@ -149,3 +149,23 @@ outputs:
           when:
             - step|int == 2
             - remove_aodh_listener_package|bool
+      fast_forward_upgrade_tasks:
+        - name: FFU check if openstack-aodh-listener is deployed
+          command: systemctl is-enabled --quiet openstack-aodh-listener
+          ignore_errors: True
+          register: aodh_listener_enabled_result
+          when:
+            - step|int == 0
+            - release == 'ocata'
+        - name: Set fact aodh_listener_enabled
+          set_fact:
+            aodh_listener_enabled: "{{ aodh_listener_enabled_result.rc == 0 }}"
+          when:
+            - step|int == 0
+            - release == 'ocata'
+        - name: FFU stop and disable openstack-aodh-listener service
+          service: name=openstack-aodh-listener state=stopped enabled=no
+          when:
+            - step|int == 1
+            - release == 'ocata'
+            - aodh_listener_enabled|bool

docker/services/aodh-notifier.yaml

@@ -149,3 +149,23 @@ outputs:
           when:
             - step|int == 2
             - remove_aodh_notifier_package|bool
+      fast_forward_upgrade_tasks:
+        - name: FFU check if openstack-aodh-notifier is deployed
+          command: systemctl is-enabled --quiet openstack-aodh-notifier
+          ignore_errors: True
+          register: aodh_notifier_enabled_result
+          when:
+            - step|int == 0
+            - release == 'ocata'
+        - name: Set fact aodh_notifier_enabled
+          set_fact:
+            aodh_notifier_enabled: "{{ aodh_notifier_enabled_result.rc == 0 }}"
+          when:
+            - step|int == 0
+            - release == 'ocata'
+        - name: FFU stop and disable openstack-aodh-notifier service
+          service: name=openstack-aodh-notifier state=stopped enabled=no
+          when:
+            - step|int == 1
+            - release == 'ocata'
+            - aodh_notifier_enabled|bool