Merge "M/N upgrade set scheduler_host_manager right."

[apex-tripleo-heat-templates.git] / puppet / services / pacemaker / neutron-plugin-opencontrail.yaml

diff --git a/puppet/services/pacemaker/neutron-plugin-opencontrail.yaml b/puppet/services/pacemaker/neutron-plugin-opencontrail.yaml
index d8c7550..80d6ed9 100644 (file)
--- a/puppet/services/pacemaker/neutron-plugin-opencontrail.yaml
+++ b/puppet/services/pacemaker/neutron-plugin-opencontrail.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Neutron OpenContrail Plugin 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
@@ -15,12 +24,15 @@ resources:
   NeutronPluginOpenContrail:
     type: ../neutron-plugin-nuage.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Neutron OpenContrail plugin.
     value:
+      service_name: neutron_plugin_opencontrail
       config_settings:
         map_merge:
           - get_attr: [NeutronPluginOpenContrail, role_data, config_settings]