Merge "change sriovnicswitch to be first with openvswitch"
authorJenkins <jenkins@review.openstack.org>
Tue, 22 Aug 2017 10:27:44 +0000 (10:27 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 22 Aug 2017 10:27:44 +0000 (10:27 +0000)
environments/neutron-sriov.yaml

index 5e9e15e..591e226 100755 (executable)
@@ -3,7 +3,7 @@ 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']