Merge "change sriovnicswitch to be first with openvswitch"

[apex-tripleo-heat-templates.git] / environments / neutron-sriov.yaml

diff --git a/environments/neutron-sriov.yaml b/environments/neutron-sriov.yaml
index 9b7e51f..591e226 100755 (executable)
--- a/environments/neutron-sriov.yaml
+++ b/environments/neutron-sriov.yaml
@@ -3,15 +3,12 @@ resource_registry:
   OS::TripleO::Services::NeutronSriovAgent: ../puppet/services/neutron-sriov-agent.yaml
 
 parameter_defaults:
-  NeutronMechanismDrivers: ['openvswitch','sriovnicswitch']
+  NeutronMechanismDrivers: ['sriovnicswitch', 'openvswitch']
 
   # Add PciPassthroughFilter to the scheduler default filters
   #NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
   #NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
 
-  # Provide the vendorid:productid of the VFs
-  #NeutronSupportedPCIVendorDevs: ['8086:154c','8086:10ca','8086:1520']
-
   #NeutronPhysicalDevMappings: "datacentre:ens20f2"
 
   # Number of VFs that needs to be configured for a physical interface