Merge "Release notes ha composable"

[apex-tripleo-heat-templates.git] / puppet / services / ceilometer-agent-central.yaml

diff --git a/puppet/services/ceilometer-agent-central.yaml b/puppet/services/ceilometer-agent-central.yaml
index 07f0b49..cf8a8a8 100644 (file)
--- a/puppet/services/ceilometer-agent-central.yaml
+++ b/puppet/services/ceilometer-agent-central.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Ceilometer Central Agent service configured with Puppet
@@ -51,14 +51,13 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [CeilometerServiceBase, role_data, config_settings]
-          - ceilometer::agent::central::coordination_url:
-              list_join:
-                - ''
-                - - 'redis://:'
-                  - {get_param: RedisPassword}
-                  - '@'
-                  - "%{hiera('redis_vip')}"
-                  - ':6379/'
-            ceilometer_redis_password: {get_param: RedisPassword}
+          - ceilometer_redis_password: {get_param: RedisPassword}
       step_config: |
         include ::tripleo::profile::base::ceilometer::agent::central
+      upgrade_tasks:
+        - name: "PreUpgrade step0,validation: Check service openstack-ceilometer-central is running"
+          shell: /usr/bin/systemctl show 'openstack-ceilometer-central' --property ActiveState | grep '\bactive\b'
+          tags: step0,validation
+        - name: Stop ceilometer_agent_central service
+          tags: step2
+          service: name=openstack-ceilometer-central state=stopped