From: Lee Yarwood <lyarwood@redhat.com>
Date: Tue, 15 Aug 2017 10:19:05 +0000 (+0100)
Subject: docker: Stop all active ceilometer services during compute upgrade
X-Git-Tag: opnfv-6.0.0~198^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=38d19681a9b37c7186aedc40b03c2cf4218d2fa9;p=apex-tripleo-heat-templates.git

docker: Stop all active ceilometer services during compute upgrade

Ensure both the older compute and newer generic polling host services
are stopped during a compute upgrade.

Closes-Bug: #1710866
Change-Id: I2c63d6d50977eed112707c3c8aa6d46d8b796679
---

diff --git a/docker/services/ceilometer-agent-compute.yaml b/docker/services/ceilometer-agent-compute.yaml
index 09677c64..535b1693 100644
--- a/docker/services/ceilometer-agent-compute.yaml
+++ b/docker/services/ceilometer-agent-compute.yaml
@@ -92,6 +92,21 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:
-        - name: Stop and disable ceilometer-agent-compute service
+        - name: Check if openstack-ceilometer-compute is deployed
+          command: systemctl is-enabled openstack-ceilometer-compute
+          tags: step2
+          ignore_errors: True
+          register: openstack_ceilometer_compute_enabled
+        - name: Check if openstack-ceilometer-polling is deployed
+          command: systemctl is-enabled openstack-ceilometer-polling
+          tags: step2 
+          ignore_errors: True
+          register: openstack_ceilometer_polling_enabled
+        - name: Stop and disable ceilometer compute agent
           tags: step2
           service: name=openstack-ceilometer-compute state=stopped enabled=no
+          when: openstack_ceilometer_compute_enabled.rc == 0
+        - name: Stop and disable ceilometer polling agent
+          tags: step2
+          service: name=openstack-ceilometer-polling state=stopped enabled=no
+          when: openstack_ceilometer_polling_enabled.rc == 0