Add DefaultPasswords to composable services

[apex-tripleo-heat-templates.git] / puppet / services / pacemaker / ceilometer-api.yaml

diff --git a/puppet/services/pacemaker/ceilometer-api.yaml b/puppet/services/pacemaker/ceilometer-api.yaml
index de361de..f50e4a1 100644 (file)
--- a/puppet/services/pacemaker/ceilometer-api.yaml
+++ b/puppet/services/pacemaker/ceilometer-api.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Ceilometer API service with Pacemaker 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
@@ -14,16 +23,19 @@ 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 API pacemaker role.
     value:
+      service_name: ceilometer_api
       config_settings:
         map_merge:
           - get_attr: [CeilometerServiceBase, role_data, config_settings]
           - ceilometer::api::manage_service: false
-          - ceilometer::api::enabled: false
+            ceilometer::api::enabled: false
       step_config: |
         include ::tripleo::profile::pacemaker::ceilometer::api