Merge "Add cinder-backup service as role"

[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 34735f7..a51ec2d 100644 (file)
--- a/puppet/services/ceilometer-agent-central.yaml
+++ b/puppet/services/ceilometer-agent-central.yaml
@@ -13,10 +13,6 @@ parameters:
     description: The password for the redis service account.
     type: string
     hidden: true
-  RedisVirtualIPUri:
-    type: string
-    default: ''
-
 
 resources:
   CeilometerServiceBase:
@@ -28,7 +24,7 @@ outputs:
   role_data:
     description: Role data for the Ceilometer Central Agent role.
     value:
-      service_name: ceilometer-agent-central
+      service_name: ceilometer_agent_central
       config_settings:
         map_merge:
           - get_attr: [CeilometerServiceBase, role_data, config_settings]
@@ -38,7 +34,7 @@ outputs:
                 - - 'redis://:'
                   - {get_param: RedisPassword}
                   - '@'
-                  - {get_param: RedisVirtualIPUri}
+                  - "%{hiera('redis_vip')}"
                   - ':6379/'
       step_config: |
         include ::tripleo::profile::base::ceilometer::agent::central