X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fneutron-plugin-opencontrail.yaml;h=098c9d05db02398630d80e7ae47c949a40ac0aae;hb=370d392dc58a124ffe09800476d1099bf6268cb3;hp=1d23c4970b5514d6867e3f07cad334681621eb8a;hpb=aa71f16a69f063f9a23377271c7cd17a0c4195cc;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/neutron-plugin-opencontrail.yaml b/puppet/services/neutron-plugin-opencontrail.yaml
index 1d23c497..098c9d05 100644
--- a/puppet/services/neutron-plugin-opencontrail.yaml
+++ b/puppet/services/neutron-plugin-opencontrail.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Neutron Opencontrail plugin
 
 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
@@ -37,16 +46,20 @@ resources:
 
   NeutronBase:
     type: ./neutron-base.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
+      service_name: neutron_plugin_opencontrail
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]
-          - neutron::api_extensions_path: /usr/lib/python2.7/site-packages/neutron_plugin_contrail/extensions
+          - neutron::api_extensions_path: /usr/lib/python2.7/site-packages/neutron_plugin_contrail/extensions,/usr/lib/python2.7/site-packages/neutron_lbaas/extensions
 
             neutron::plugins::opencontrail::api_server_ip: {get_param: ContrailApiServerIp}
             neutron::plugins::opencontrail::api_server_port: {get_param: ContrailApiServerPort}