From 306412539a92c03ac06c0bad38d6d14f2ea2f4f3 Mon Sep 17 00:00:00 2001 From: Marios Andreou Date: Tue, 9 Oct 2018 12:16:22 +0300 Subject: [PATCH] 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 0ec9a3db94a6a0e09387f7d86860d93708c524db) (cherry picked from commit 1d736b7e675176fa7170f82e0545ff156fea6f76) --- environments/cavium-liquidio.yaml | 2 +- environments/neutron-ovs-dpdk.yaml | 2 +- environments/neutron-sriov.yaml | 2 +- environments/ovs-hw-offload.yaml | 2 +- .../services-baremetal/neutron-opendaylight-dpdk.yaml | 4 ++-- .../services-baremetal/neutron-opendaylight-hw-offload.yaml | 2 +- .../services-baremetal/neutron-opendaylight-sriov.yaml | 2 +- environments/services-baremetal/neutron-ovs-dpdk.yaml | 2 +- environments/services-baremetal/neutron-ovs-hw-offload.yaml | 2 +- environments/services-baremetal/neutron-sriov.yaml | 2 +- environments/services-docker/neutron-sriov.yaml | 2 +- environments/services/neutron-opendaylight-dpdk.yaml | 4 ++-- environments/services/neutron-opendaylight-hw-offload.yaml | 2 +- environments/services/neutron-opendaylight-sriov.yaml | 2 +- environments/services/neutron-ovs-dpdk.yaml | 2 +- environments/services/neutron-ovs-hw-offload.yaml | 2 +- environments/services/neutron-sriov.yaml | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/environments/cavium-liquidio.yaml b/environments/cavium-liquidio.yaml index facc4bae0d..4dbe3b5521 100644 --- a/environments/cavium-liquidio.yaml +++ b/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.*" diff --git a/environments/neutron-ovs-dpdk.yaml b/environments/neutron-ovs-dpdk.yaml index 4dd6fd2ab5..6c19f8a51b 100644 --- a/environments/neutron-ovs-dpdk.yaml +++ b/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: diff --git a/environments/neutron-sriov.yaml b/environments/neutron-sriov.yaml index 5a07b87f85..c756486aae 100755 --- a/environments/neutron-sriov.yaml +++ b/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"] diff --git a/environments/ovs-hw-offload.yaml b/environments/ovs-hw-offload.yaml index dc282110ff..7fc4acc9c6 100644 --- a/environments/ovs-hw-offload.yaml +++ b/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: diff --git a/environments/services-baremetal/neutron-opendaylight-dpdk.yaml b/environments/services-baremetal/neutron-opendaylight-dpdk.yaml index dffafa9724..85146df97c 100644 --- a/environments/services-baremetal/neutron-opendaylight-dpdk.yaml +++ b/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. \ No newline at end of file + # on the same NUMA node(s) selected for previous settings. diff --git a/environments/services-baremetal/neutron-opendaylight-hw-offload.yaml b/environments/services-baremetal/neutron-opendaylight-hw-offload.yaml index 7b7e4251f6..8dd8cbf1df 100644 --- a/environments/services-baremetal/neutron-opendaylight-hw-offload.yaml +++ b/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 diff --git a/environments/services-baremetal/neutron-opendaylight-sriov.yaml b/environments/services-baremetal/neutron-opendaylight-sriov.yaml index c499530645..e458dc740c 100644 --- a/environments/services-baremetal/neutron-opendaylight-sriov.yaml +++ b/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" diff --git a/environments/services-baremetal/neutron-ovs-dpdk.yaml b/environments/services-baremetal/neutron-ovs-dpdk.yaml index ccbb99df7e..dd47591df0 100644 --- a/environments/services-baremetal/neutron-ovs-dpdk.yaml +++ b/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" diff --git a/environments/services-baremetal/neutron-ovs-hw-offload.yaml b/environments/services-baremetal/neutron-ovs-hw-offload.yaml index 08bc7781d1..084befe96c 100644 --- a/environments/services-baremetal/neutron-ovs-hw-offload.yaml +++ b/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 diff --git a/environments/services-baremetal/neutron-sriov.yaml b/environments/services-baremetal/neutron-sriov.yaml index 9cf332edc3..5744c7cdee 100644 --- a/environments/services-baremetal/neutron-sriov.yaml +++ b/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"] diff --git a/environments/services-docker/neutron-sriov.yaml b/environments/services-docker/neutron-sriov.yaml index 917258684b..8b3394c0a4 100644 --- a/environments/services-docker/neutron-sriov.yaml +++ b/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"] diff --git a/environments/services/neutron-opendaylight-dpdk.yaml b/environments/services/neutron-opendaylight-dpdk.yaml index dffafa9724..85146df97c 100644 --- a/environments/services/neutron-opendaylight-dpdk.yaml +++ b/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. \ No newline at end of file + # on the same NUMA node(s) selected for previous settings. diff --git a/environments/services/neutron-opendaylight-hw-offload.yaml b/environments/services/neutron-opendaylight-hw-offload.yaml index 973185f35e..25eb32d2c2 100644 --- a/environments/services/neutron-opendaylight-hw-offload.yaml +++ b/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 diff --git a/environments/services/neutron-opendaylight-sriov.yaml b/environments/services/neutron-opendaylight-sriov.yaml index 688d15dbdf..34648480ee 100644 --- a/environments/services/neutron-opendaylight-sriov.yaml +++ b/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" diff --git a/environments/services/neutron-ovs-dpdk.yaml b/environments/services/neutron-ovs-dpdk.yaml index e35e8c60a2..0c4d3a6b35 100644 --- a/environments/services/neutron-ovs-dpdk.yaml +++ b/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" diff --git a/environments/services/neutron-ovs-hw-offload.yaml b/environments/services/neutron-ovs-hw-offload.yaml index 08bc7781d1..084befe96c 100644 --- a/environments/services/neutron-ovs-hw-offload.yaml +++ b/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 diff --git a/environments/services/neutron-sriov.yaml b/environments/services/neutron-sriov.yaml index 833581c905..ebb0468765 100644 --- a/environments/services/neutron-sriov.yaml +++ b/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"]