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 commit0ec9a3db94
) (cherry picked from commit1d736b7e67
)
This commit is contained in:
parent
5187416181
commit
306412539a
|
@ -11,7 +11,7 @@ parameter_defaults:
|
||||||
LiquidioProviderMappings: 'datacentre:eth1'
|
LiquidioProviderMappings: 'datacentre:eth1'
|
||||||
ComputeLiquidioParameters:
|
ComputeLiquidioParameters:
|
||||||
KernelArgs: "intel_iommu=on iommu=pt"
|
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:
|
#NovaPCIPassthrough:
|
||||||
# - address: "*:02:00.*"
|
# - address: "*:02:00.*"
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ resource_registry:
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
NeutronDatapathType: "netdev"
|
NeutronDatapathType: "netdev"
|
||||||
NeutronVhostuserSocketDir: "/var/lib/vhost_sockets"
|
NeutronVhostuserSocketDir: "/var/lib/vhost_sockets"
|
||||||
NovaSchedulerDefaultFilters: "RamFilter,ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
|
NovaSchedulerDefaultFilters: "ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
|
||||||
OvsDpdkDriverType: "vfio-pci"
|
OvsDpdkDriverType: "vfio-pci"
|
||||||
|
|
||||||
#ComputeOvsDpdkParameters:
|
#ComputeOvsDpdkParameters:
|
||||||
|
|
|
@ -5,5 +5,5 @@ resource_registry:
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
NeutronMechanismDrivers: ['sriovnicswitch', 'openvswitch']
|
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"]
|
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
parameter_defaults:
|
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"]
|
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
|
||||||
|
|
||||||
ComputeSriovParameters:
|
ComputeSriovParameters:
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# This file is to be used with neutron-opendaylight.yaml
|
# This file is to be used with neutron-opendaylight.yaml
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
NovaSchedulerDefaultFilters: "RamFilter,ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
|
NovaSchedulerDefaultFilters: "ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
|
||||||
OpenDaylightSNATMechanism: 'controller'
|
OpenDaylightSNATMechanism: 'controller'
|
||||||
|
|
||||||
ComputeOvsDpdkParameters:
|
ComputeOvsDpdkParameters:
|
||||||
|
@ -34,4 +34,4 @@ parameter_defaults:
|
||||||
# physical core. Also, specifying more than one core will trigger multiple PMD
|
# physical core. Also, specifying more than one core will trigger multiple PMD
|
||||||
# threads to be spawned, which may improve dataplane performance.
|
# threads to be spawned, which may improve dataplane performance.
|
||||||
#NovaVcpuPinSet: "" # Cores to pin Nova instances to. For maximum performance, select cores
|
#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.
|
||||||
|
|
|
@ -16,7 +16,7 @@ parameter_defaults:
|
||||||
NeutronPluginExtensions: 'port_security'
|
NeutronPluginExtensions: 'port_security'
|
||||||
NeutronMechanismDrivers: ['opendaylight_v2']
|
NeutronMechanismDrivers: ['opendaylight_v2']
|
||||||
NeutronServicePlugins: 'odl-router_v2,trunk'
|
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"]
|
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
|
||||||
|
|
||||||
# Kernel arguments for ComputeSriov node
|
# Kernel arguments for ComputeSriov node
|
||||||
|
|
|
@ -9,7 +9,7 @@ parameter_defaults:
|
||||||
NeutronMechanismDrivers: ['sriovnicswitch','opendaylight_v2']
|
NeutronMechanismDrivers: ['sriovnicswitch','opendaylight_v2']
|
||||||
|
|
||||||
# Add PciPassthroughFilter to the scheduler default filters
|
# 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"]
|
#NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
|
||||||
|
|
||||||
#NeutronPhysicalDevMappings: "datacentre:ens20f2"
|
#NeutronPhysicalDevMappings: "datacentre:ens20f2"
|
||||||
|
|
|
@ -6,6 +6,6 @@ resource_registry:
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
NeutronDatapathType: "netdev"
|
NeutronDatapathType: "netdev"
|
||||||
NeutronVhostuserSocketDir: "/var/lib/vhost_sockets"
|
NeutronVhostuserSocketDir: "/var/lib/vhost_sockets"
|
||||||
NovaSchedulerDefaultFilters: "RamFilter,ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
|
NovaSchedulerDefaultFilters: "ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
|
||||||
OvsDpdkDriverType: "vfio-pci"
|
OvsDpdkDriverType: "vfio-pci"
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ resource_registry:
|
||||||
|
|
||||||
parameter_defaults:
|
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"]
|
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
|
||||||
|
|
||||||
# Kernel arguments for ComputeSriov node
|
# Kernel arguments for ComputeSriov node
|
||||||
|
|
|
@ -5,5 +5,5 @@ resource_registry:
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
NeutronMechanismDrivers: ['sriovnicswitch','openvswitch']
|
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"]
|
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
|
||||||
|
|
|
@ -8,5 +8,5 @@ resource_registry:
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
NeutronMechanismDrivers: ['sriovnicswitch','openvswitch']
|
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"]
|
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# This file is to be used with neutron-opendaylight.yaml
|
# This file is to be used with neutron-opendaylight.yaml
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
NovaSchedulerDefaultFilters: "RamFilter,ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
|
NovaSchedulerDefaultFilters: "ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
|
||||||
OpenDaylightSNATMechanism: 'controller'
|
OpenDaylightSNATMechanism: 'controller'
|
||||||
|
|
||||||
ComputeOvsDpdkParameters:
|
ComputeOvsDpdkParameters:
|
||||||
|
@ -34,4 +34,4 @@ parameter_defaults:
|
||||||
# physical core. Also, specifying more than one core will trigger multiple PMD
|
# physical core. Also, specifying more than one core will trigger multiple PMD
|
||||||
# threads to be spawned, which may improve dataplane performance.
|
# threads to be spawned, which may improve dataplane performance.
|
||||||
#NovaVcpuPinSet: "" # Cores to pin Nova instances to. For maximum performance, select cores
|
#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.
|
||||||
|
|
|
@ -16,7 +16,7 @@ parameter_defaults:
|
||||||
NeutronPluginExtensions: 'port_security'
|
NeutronPluginExtensions: 'port_security'
|
||||||
NeutronMechanismDrivers: ['opendaylight_v2']
|
NeutronMechanismDrivers: ['opendaylight_v2']
|
||||||
NeutronServicePlugins: 'odl-router_v2,trunk'
|
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"]
|
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
|
||||||
|
|
||||||
# Kernel arguments for ComputeSriov node
|
# Kernel arguments for ComputeSriov node
|
||||||
|
|
|
@ -10,7 +10,7 @@ parameter_defaults:
|
||||||
NeutronMechanismDrivers: ['sriovnicswitch','opendaylight_v2']
|
NeutronMechanismDrivers: ['sriovnicswitch','opendaylight_v2']
|
||||||
|
|
||||||
# Add PciPassthroughFilter to the scheduler default filters
|
# 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"]
|
#NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
|
||||||
|
|
||||||
#NeutronPhysicalDevMappings: "datacentre:ens20f2"
|
#NeutronPhysicalDevMappings: "datacentre:ens20f2"
|
||||||
|
|
|
@ -6,6 +6,6 @@ resource_registry:
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
NeutronDatapathType: "netdev"
|
NeutronDatapathType: "netdev"
|
||||||
NeutronVhostuserSocketDir: "/var/lib/vhost_sockets"
|
NeutronVhostuserSocketDir: "/var/lib/vhost_sockets"
|
||||||
NovaSchedulerDefaultFilters: "RamFilter,ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
|
NovaSchedulerDefaultFilters: "ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
|
||||||
OvsDpdkDriverType: "vfio-pci"
|
OvsDpdkDriverType: "vfio-pci"
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ resource_registry:
|
||||||
|
|
||||||
parameter_defaults:
|
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"]
|
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
|
||||||
|
|
||||||
# Kernel arguments for ComputeSriov node
|
# Kernel arguments for ComputeSriov node
|
||||||
|
|
|
@ -5,5 +5,5 @@ resource_registry:
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
NeutronMechanismDrivers: ['sriovnicswitch','openvswitch']
|
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"]
|
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
|
||||||
|
|
Loading…
Reference in New Issue