Merge "Enable ceilometer compute agent" into stable/pike

[apex-tripleo-heat-templates.git] / docker / services / ceilometer-agent-compute.yaml

diff --git a/docker/services/ceilometer-agent-compute.yaml b/docker/services/ceilometer-agent-compute.yaml
index ef93890..535b169 100644 (file)
--- a/docker/services/ceilometer-agent-compute.yaml
+++ b/docker/services/ceilometer-agent-compute.yaml
@@ -15,6 +15,10 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -42,6 +46,7 @@ resources:
     type: ../../puppet/services/ceilometer-agent-compute.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       RoleName: {get_param: RoleName}
@@ -87,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