Merge "Remove deprecated Ram/Disk filters in NovaSchedulerDefaultFilters"

2018-10-11 15:54:56 +00:00 · 2018-10-11 15:54:56 +00:00 · bef800dc05
commit bef800dc05
parent 20a5085ccb 0ec9a3db94
18 changed files with 20 additions and 20 deletions
--- a/environments/cavium-liquidio.yaml
+++ b/environments/cavium-liquidio.yaml
@ -12,7 +12,7 @@ parameter_defaults:
   ComputeLiquidioParameters:
     KernelArgs: "intel_iommu=on iommu=pt"
     NovaOVSDBConnection: "tcp:127.0.0.1:6640"
-   #NovaSchedulerDefaultFilters: ['RetryFilter', 'AvailabilityZoneFilter', 'RamFilter', 'ComputeFilter', 'ComputeCapabilitiesFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter', 'PciPassthroughFilter']
+   #NovaSchedulerDefaultFilters: ['RetryFilter', 'AvailabilityZoneFilter', 'ComputeFilter', 'ComputeCapabilitiesFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter', 'PciPassthroughFilter']
   #NovaPCIPassthrough:
   #  - address: "*:02:00.*"

--- a/environments/neutron-ml2-ovn-hw-offload.yaml
+++ b/environments/neutron-ml2-ovn-hw-offload.yaml
@ -23,7 +23,7 @@ parameter_defaults:
  NeutronNetworkType: 'geneve'
  NeutronServicePlugins: 'qos,ovn-router,trunk'
  NeutronVniRanges: ['1:65536', ]
-  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"]

  ComputeSriovParameters:
--- 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:
--- 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"]
--- a/environments/ovs-hw-offload.yaml
+++ b/environments/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"]
  #NovaPCIPassthrough:
  #  - devname: "ens3f0"
--- 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.
+                                   # on the same NUMA node(s) selected for previous settings.
--- 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
--- 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"
--- 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"

--- 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
--- 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"]
--- 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.
+                                   # on the same NUMA node(s) selected for previous settings.
--- a/environments/services/neutron-opendaylight-hw-offload.yaml
+++ b/environments/services/neutron-opendaylight-hw-offload.yaml
@ -17,7 +17,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
--- 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"
--- a/environments/services/neutron-ovn-sriov.yaml
+++ b/environments/services/neutron-ovn-sriov.yaml
@ -13,5 +13,5 @@ resource_registry:

 parameter_defaults:
  NeutronMechanismDrivers: ['sriovnicswitch','ovn']
-  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"]
--- 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"

--- 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
--- 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"]