X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fneutron-plugin-ml2.yaml;h=5dbae3dce9d993cb07231c3cc79fa143a886b381;hb=20188a2bf00b8b8e32c8fccd631b3c50b7bb2a9d;hp=435a6de0210f21358b3832763e32ed257677ba0f;hpb=d7fd9b075fad85efe4ab7809d4e1e66b3ae6c196;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/neutron-plugin-ml2.yaml b/puppet/services/neutron-plugin-ml2.yaml
index 435a6de0..5dbae3dc 100644
--- a/puppet/services/neutron-plugin-ml2.yaml
+++ b/puppet/services/neutron-plugin-ml2.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Neutron ML2 Plugin 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
@@ -51,16 +60,26 @@ parameters:
     default: 'vxlan'
     description: The tenant network type for Neutron.
     type: comma_delimited_list
-
+  NeutronSupportedPCIVendorDevs:
+    description: |
+        List of supported pci vendor devices in the format VendorID:ProductID.
+        By default Intel & Mellanox SR-IOV capable NICs are supported.
+    type: comma_delimited_list
+    default: ['15b3:1004','8086:10ca']
 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 ML2 plugin.
     value:
+      service_name: neutron_plugin_ml2
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]
@@ -104,6 +123,7 @@ outputs:
                 template: TYPES
                 params:
                   TYPES: {get_param: NeutronNetworkType}
+            neutron::plugins::ml2::supported_pci_vendor_devs: {get_param: NeutronSupportedPCIVendorDevs}
 
       step_config: |
-        include ::tripleo::profile::base::neutron::ml2
+        include ::tripleo::profile::base::neutron::plugins::ml2