Browse Source

Remove deprecated Ram/Disk filters in NovaSchedulerDefaultFilters

As reported in the related bug below and merged for the undercloud
with https://review.openstack.org/#/c/598167 the Ram/Disk filters
are deprecated since [1] so we should stop using them.

Conflicts:
       environments/neutron-ml2-ovn-hw-offload.yaml
       environments/ovs-hw-offload.yaml
       environments/services-docker/neutron-sriov.yaml

[1] https://review.openstack.org/#/c/596502/
Related-Bug: 1787910
Change-Id: Ib3585b4c04c974c34d61b868d0454df03c1a2aed
(cherry picked from commit 0ec9a3db94)
(cherry picked from commit 1d736b7e67)
changes/23/660023/1
Marios Andreou 3 years ago
committed by Rajesh Tailor
parent
commit
306412539a
  1. 2
      environments/cavium-liquidio.yaml
  2. 2
      environments/neutron-ovs-dpdk.yaml
  3. 2
      environments/neutron-sriov.yaml
  4. 2
      environments/ovs-hw-offload.yaml
  5. 4
      environments/services-baremetal/neutron-opendaylight-dpdk.yaml
  6. 2
      environments/services-baremetal/neutron-opendaylight-hw-offload.yaml
  7. 2
      environments/services-baremetal/neutron-opendaylight-sriov.yaml
  8. 2
      environments/services-baremetal/neutron-ovs-dpdk.yaml
  9. 2
      environments/services-baremetal/neutron-ovs-hw-offload.yaml
  10. 2
      environments/services-baremetal/neutron-sriov.yaml
  11. 2
      environments/services-docker/neutron-sriov.yaml
  12. 4
      environments/services/neutron-opendaylight-dpdk.yaml
  13. 2
      environments/services/neutron-opendaylight-hw-offload.yaml
  14. 2
      environments/services/neutron-opendaylight-sriov.yaml
  15. 2
      environments/services/neutron-ovs-dpdk.yaml
  16. 2
      environments/services/neutron-ovs-hw-offload.yaml
  17. 2
      environments/services/neutron-sriov.yaml

2
environments/cavium-liquidio.yaml

@ -11,7 +11,7 @@ parameter_defaults:
LiquidioProviderMappings: 'datacentre:eth1'
ComputeLiquidioParameters:
KernelArgs: "intel_iommu=on iommu=pt"
#NovaSchedulerDefaultFilters: ['RetryFilter', 'AvailabilityZoneFilter', 'RamFilter', 'ComputeFilter', 'ComputeCapabilitiesFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter', 'PciPassthroughFilter']
#NovaSchedulerDefaultFilters: ['RetryFilter', 'AvailabilityZoneFilter', 'ComputeFilter', 'ComputeCapabilitiesFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter', 'PciPassthroughFilter']
#NovaPCIPassthrough:
# - address: "*:02:00.*"

2
environments/neutron-ovs-dpdk.yaml

@ -6,7 +6,7 @@ resource_registry:
parameter_defaults:
NeutronDatapathType: "netdev"
NeutronVhostuserSocketDir: "/var/lib/vhost_sockets"
NovaSchedulerDefaultFilters: "RamFilter,ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
NovaSchedulerDefaultFilters: "ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
OvsDpdkDriverType: "vfio-pci"
#ComputeOvsDpdkParameters:

2
environments/neutron-sriov.yaml

@ -5,5 +5,5 @@ resource_registry:
parameter_defaults:
NeutronMechanismDrivers: ['sriovnicswitch', 'openvswitch']
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]

2
environments/ovs-hw-offload.yaml

@ -4,7 +4,7 @@
parameter_defaults:
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter','NUMATopologyFilter']
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
ComputeSriovParameters:

4
environments/services-baremetal/neutron-opendaylight-dpdk.yaml

@ -2,7 +2,7 @@
# This file is to be used with neutron-opendaylight.yaml
parameter_defaults:
NovaSchedulerDefaultFilters: "RamFilter,ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
NovaSchedulerDefaultFilters: "ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
OpenDaylightSNATMechanism: 'controller'
ComputeOvsDpdkParameters:
@ -34,4 +34,4 @@ parameter_defaults:
# physical core. Also, specifying more than one core will trigger multiple PMD
# threads to be spawned, which may improve dataplane performance.
#NovaVcpuPinSet: "" # Cores to pin Nova instances to. For maximum performance, select cores
# on the same NUMA node(s) selected for previous settings.
# on the same NUMA node(s) selected for previous settings.

2
environments/services-baremetal/neutron-opendaylight-hw-offload.yaml

@ -16,7 +16,7 @@ parameter_defaults:
NeutronPluginExtensions: 'port_security'
NeutronMechanismDrivers: ['opendaylight_v2']
NeutronServicePlugins: 'odl-router_v2,trunk'
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
# Kernel arguments for ComputeSriov node

2
environments/services-baremetal/neutron-opendaylight-sriov.yaml

@ -9,7 +9,7 @@ parameter_defaults:
NeutronMechanismDrivers: ['sriovnicswitch','opendaylight_v2']
# Add PciPassthroughFilter to the scheduler default filters
#NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
#NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
#NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
#NeutronPhysicalDevMappings: "datacentre:ens20f2"

2
environments/services-baremetal/neutron-ovs-dpdk.yaml

@ -6,6 +6,6 @@ resource_registry:
parameter_defaults:
NeutronDatapathType: "netdev"
NeutronVhostuserSocketDir: "/var/lib/vhost_sockets"
NovaSchedulerDefaultFilters: "RamFilter,ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
NovaSchedulerDefaultFilters: "ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
OvsDpdkDriverType: "vfio-pci"

2
environments/services-baremetal/neutron-ovs-hw-offload.yaml

@ -7,7 +7,7 @@ resource_registry:
parameter_defaults:
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
# Kernel arguments for ComputeSriov node

2
environments/services-baremetal/neutron-sriov.yaml

@ -5,5 +5,5 @@ resource_registry:
parameter_defaults:
NeutronMechanismDrivers: ['sriovnicswitch','openvswitch']
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]

2
environments/services-docker/neutron-sriov.yaml

@ -8,5 +8,5 @@ resource_registry:
parameter_defaults:
NeutronMechanismDrivers: ['sriovnicswitch','openvswitch']
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]

4
environments/services/neutron-opendaylight-dpdk.yaml

@ -2,7 +2,7 @@
# This file is to be used with neutron-opendaylight.yaml
parameter_defaults:
NovaSchedulerDefaultFilters: "RamFilter,ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
NovaSchedulerDefaultFilters: "ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
OpenDaylightSNATMechanism: 'controller'
ComputeOvsDpdkParameters:
@ -34,4 +34,4 @@ parameter_defaults:
# physical core. Also, specifying more than one core will trigger multiple PMD
# threads to be spawned, which may improve dataplane performance.
#NovaVcpuPinSet: "" # Cores to pin Nova instances to. For maximum performance, select cores
# on the same NUMA node(s) selected for previous settings.
# on the same NUMA node(s) selected for previous settings.

2
environments/services/neutron-opendaylight-hw-offload.yaml

@ -16,7 +16,7 @@ parameter_defaults:
NeutronPluginExtensions: 'port_security'
NeutronMechanismDrivers: ['opendaylight_v2']
NeutronServicePlugins: 'odl-router_v2,trunk'
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
# Kernel arguments for ComputeSriov node

2
environments/services/neutron-opendaylight-sriov.yaml

@ -10,7 +10,7 @@ parameter_defaults:
NeutronMechanismDrivers: ['sriovnicswitch','opendaylight_v2']
# Add PciPassthroughFilter to the scheduler default filters
#NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
#NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
#NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
#NeutronPhysicalDevMappings: "datacentre:ens20f2"

2
environments/services/neutron-ovs-dpdk.yaml

@ -6,6 +6,6 @@ resource_registry:
parameter_defaults:
NeutronDatapathType: "netdev"
NeutronVhostuserSocketDir: "/var/lib/vhost_sockets"
NovaSchedulerDefaultFilters: "RamFilter,ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
NovaSchedulerDefaultFilters: "ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
OvsDpdkDriverType: "vfio-pci"

2
environments/services/neutron-ovs-hw-offload.yaml

@ -7,7 +7,7 @@ resource_registry:
parameter_defaults:
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
# Kernel arguments for ComputeSriov node

2
environments/services/neutron-sriov.yaml

@ -5,5 +5,5 @@ resource_registry:
parameter_defaults:
NeutronMechanismDrivers: ['sriovnicswitch','openvswitch']
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
Loading…
Cancel
Save