Fix base service type inheriting gnocchi service templates

[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..72bad63 100644 (file)
--- a/puppet/services/ceilometer-agent-central.yaml
+++ b/puppet/services/ceilometer-agent-central.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Ceilometer Central Agent service configured with Puppet
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -13,22 +22,20 @@ parameters:
     description: The password for the redis service account.
     type: string
     hidden: true
-  RedisVirtualIPUri:
-    type: string
-    default: ''
-
 
 resources:
   CeilometerServiceBase:
     type: ./ceilometer-base.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 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 +45,7 @@ outputs:
                 - - 'redis://:'
                   - {get_param: RedisPassword}
                   - '@'
-                  - {get_param: RedisVirtualIPUri}
+                  - "%{hiera('redis_vip')}"
                   - ':6379/'
       step_config: |
         include ::tripleo::profile::base::ceilometer::agent::central