diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-09-11 15:57:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-09-11 15:57:52 +0000 |
| commit | d99b7b9e067a036352fdc94217195f3d7055ea7b (patch) | |
| tree | 3615dba2fbb39da57dfc20b91384ac91a3e359a6 /environments/neutron-sriov.yaml | |
| parent | bb28bfd03c3897781f277bbcf07c241e43efdc75 (diff) | |
| parent | 5d977e5e1bbf5eba378c9aaff02a44f747f642e6 (diff) | |
Merge "Add Neutron SR-IOV agent container" into stable/pike
Diffstat (limited to 'environments/neutron-sriov.yaml')
| -rwxr-xr-x | environments/neutron-sriov.yaml | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/environments/neutron-sriov.yaml b/environments/neutron-sriov.yaml index 591e2260..26c28d28 100755 --- a/environments/neutron-sriov.yaml +++ b/environments/neutron-sriov.yaml @@ -4,16 +4,5 @@ resource_registry: parameter_defaults: 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"] - - #NeutronPhysicalDevMappings: "datacentre:ens20f2" - - # Number of VFs that needs to be configured for a physical interface - #NeutronSriovNumVFs: "ens20f2:5" - - #NovaPCIPassthrough: - # - devname: "ens20f2" - # physical_network: "datacentre" + NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter'] + NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"] |