X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fceilometer-agent-central.yaml;h=80823526c50fbbcd0e325ddc9554b3c1084456bd;hb=a8d511a05e2f94af177155546bcc5b74ee0329a0;hp=cf8a8a8e17e1a4c81790f68225d07acd1f1e279f;hpb=716374680b3d77745adb382a86dfe92801b803b2;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/ceilometer-agent-central.yaml b/puppet/services/ceilometer-agent-central.yaml
index cf8a8a8e..80823526 100644
--- a/puppet/services/ceilometer-agent-central.yaml
+++ b/puppet/services/ceilometer-agent-central.yaml
@@ -52,12 +52,20 @@ outputs:
         map_merge:
           - get_attr: [CeilometerServiceBase, role_data, config_settings]
           - ceilometer_redis_password: {get_param: RedisPassword}
+            central_namespace: true
       step_config: |
-        include ::tripleo::profile::base::ceilometer::agent::central
+        include ::tripleo::profile::base::ceilometer::agent::polling
       upgrade_tasks:
+        - name: Check if ceilometer_agent_central is deployed
+          command: systemctl is-enabled openstack-ceilometer-central
+          tags: common
+          ignore_errors: True
+          register: ceilometer_agent_central_enabled
         - name: "PreUpgrade step0,validation: Check service openstack-ceilometer-central is running"
           shell: /usr/bin/systemctl show 'openstack-ceilometer-central' --property ActiveState | grep '\bactive\b'
+          when: ceilometer_agent_central_enabled.rc == 0
           tags: step0,validation
         - name: Stop ceilometer_agent_central service
-          tags: step2
+          tags: step1
+          when: ceilometer_agent_central_enabled.rc == 0
           service: name=openstack-ceilometer-central state=stopped