Merge "Also match config volumes for /var/lib/config-data/puppet-generated/" into...

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

diff --git a/environments/neutron-sriov.yaml b/environments/neutron-sriov.yaml
index 5e9e15e..26c28d2 100755 (executable)
--- a/environments/neutron-sriov.yaml
+++ b/environments/neutron-sriov.yaml
@@ -3,17 +3,6 @@ resource_registry:
   OS::TripleO::Services::NeutronSriovAgent: ../puppet/services/neutron-sriov-agent.yaml
 
 parameter_defaults:
-  NeutronMechanismDrivers: ['openvswitch','sriovnicswitch']
-
-  # 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"]
-
-  #NeutronPhysicalDevMappings: "datacentre:ens20f2"
-
-  # Number of VFs that needs to be configured for a physical interface
-  #NeutronSriovNumVFs: "ens20f2:5"
-
-  #NovaPCIPassthrough:
-  #  - devname: "ens20f2"
-  #    physical_network: "datacentre"
+  NeutronMechanismDrivers: ['sriovnicswitch', 'openvswitch']
+  NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
+  NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]