X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fneutron-plugin-ml2.yaml;h=5dbae3dce9d993cb07231c3cc79fa143a886b381;hb=64a277323c580b16196b1d1805120ba35de1690c;hp=c1ef081fc3191f56121e871412d5985e2f9e6e0d;hpb=885b37c80ecdae308289cc2e5c2a29dc66710487;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/neutron-plugin-ml2.yaml b/puppet/services/neutron-plugin-ml2.yaml
index c1ef081f..5dbae3dc 100644
--- a/puppet/services/neutron-plugin-ml2.yaml
+++ b/puppet/services/neutron-plugin-ml2.yaml
@@ -10,6 +10,9 @@ parameters:
                  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
@@ -57,13 +60,19 @@ 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:
@@ -114,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::plugins::ml2