Add DefaultPasswords to composable services

[apex-tripleo-heat-templates.git] / puppet / services / pacemaker / neutron-ovs-agent.yaml

diff --git a/puppet/services/pacemaker/neutron-ovs-agent.yaml b/puppet/services/pacemaker/neutron-ovs-agent.yaml
index 214dc1c..353c295 100644 (file)
--- a/puppet/services/pacemaker/neutron-ovs-agent.yaml
+++ b/puppet/services/pacemaker/neutron-ovs-agent.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Neutron OVS agent 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,12 +23,16 @@ resources:
 
   NeutronOvsBase:
     type: ../neutron-ovs-agent.yaml
+    properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
+      EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Neutron OVS agent service.
     value:
-      service_name: neutron-ovs-agent
+      service_name: neutron_ovs_agent
       config_settings:
         get_attr: [NeutronOvsBase, role_data, config_settings]
       step_config: |