Merge "Refactor usage of the NovaSchedulerEnabledFilters parameter"

2021-09-29 00:18:00 +00:00 · 2021-09-29 00:18:00 +00:00 · fd0f3269d4
commit fd0f3269d4
parent 436931f3b9 16e59efb3f
7 changed files with 56 additions and 7 deletions
--- a/environments/ovs-hw-offload.yaml
+++ b/environments/ovs-hw-offload.yaml
@ -4,7 +4,15 @@

 parameter_defaults:

-  NovaSchedulerEnabledFilters: ['AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter','NUMATopologyFilter']
+  NovaSchedulerEnabledFilters:
+    - AvailabilityZoneFilter
+    - ComputeFilter
+    - ComputeCapabilitiesFilter
+    - ImagePropertiesFilter
+    - ServerGroupAntiAffinityFilter
+    - ServerGroupAffinityFilter
+    - PciPassthroughFilter
+    - NUMATopologyFilter
  NovaSchedulerAvailableFilters: ['nova.scheduler.filters.all_filters']
  #NovaPCIPassthrough:
  #  - devname: "ens3f0"
--- a/environments/services-baremetal/neutron-sriov.yaml
+++ b/environments/services-baremetal/neutron-sriov.yaml
@ -5,5 +5,12 @@ resource_registry:
 parameter_defaults:
  NeutronMechanismDrivers: ['sriovnicswitch','openvswitch']
  NeutronPluginExtensions: "qos,port_security"
-  NovaSchedulerEnabledFilters: ['AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
+  NovaSchedulerEnabledFilters:
+    - AvailabilityZoneFilter
+    - ComputeFilter
+    - ComputeCapabilitiesFilter
+    - ImagePropertiesFilter
+    - ServerGroupAntiAffinityFilter
+    - ServerGroupAffinityFilter
+    - PciPassthroughFilter
  NovaSchedulerAvailableFilters: ['nova.scheduler.filters.all_filters']
--- a/environments/services/neutron-mlnx-agent.yaml
+++ b/environments/services/neutron-mlnx-agent.yaml
@ -8,7 +8,15 @@ parameter_defaults:
  NeutronMechanismDrivers: ['mlnx_sdn_assist','mlnx_infiniband']
  NeutronPluginExtensions: "qos,port_security"
  NeutronPhysicalDevMappings: ['datacentre:ib0']
-  NovaSchedulerEnabledFilters: ['AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter', 'NUMATopologyFilter']
+  NovaSchedulerEnabledFilters:
+    - AvailabilityZoneFilter
+    - ComputeFilter
+    - ComputeCapabilitiesFilter
+    - ImagePropertiesFilter
+    - ServerGroupAntiAffinityFilter
+    - ServerGroupAffinityFilter
+    - PciPassthroughFilter
+    - NUMATopologyFilter
  NovaSchedulerAvailableFilters: ['nova.scheduler.filters.all_filters']
  MultiInterfaceEnabled: true
  BindNormalPortsPhysnet: 'datacentre'
--- a/environments/services/neutron-ovn-sriov.yaml
+++ b/environments/services/neutron-ovn-sriov.yaml
@ -8,7 +8,14 @@ resource_registry:

 parameter_defaults:
  NeutronMechanismDrivers: ['sriovnicswitch','ovn']
-  NovaSchedulerEnabledFilters: ['AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
+  NovaSchedulerEnabledFilters:
+    - AvailabilityZoneFilter
+    - ComputeFilter
+    - ComputeCapabilitiesFilter
+    - ImagePropertiesFilter
+    - ServerGroupAntiAffinityFilter
+    - ServerGroupAffinityFilter
+    - PciPassthroughFilter
  NovaSchedulerAvailableFilters: ['nova.scheduler.filters.all_filters']
  ControllerSriovParameters:
    OVNCMSOptions: "enable-chassis-as-gw"
--- a/environments/services/neutron-ovs-dpdk.yaml
+++ b/environments/services/neutron-ovs-dpdk.yaml
@ -6,7 +6,12 @@ resource_registry:
 parameter_defaults:
  NeutronDatapathType: "netdev"
  NeutronVhostuserSocketDir: "/var/lib/vhost_sockets"
-  NovaSchedulerEnabledFilters: "ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
+  NovaSchedulerEnabledFilters:
+    - ComputeFilter
+    - AvailabilityZoneFilter
+    - ComputeCapabilitiesFilter
+    - ImagePropertiesFilter
+    - NUMATopologyFilter
  OvsDpdkDriverType: "vfio-pci"
  NeutronPluginExtensions: "qos,port_security"

--- a/environments/services/neutron-sriov.yaml
+++ b/environments/services/neutron-sriov.yaml
@ -5,5 +5,12 @@ resource_registry:
 parameter_defaults:
  NeutronMechanismDrivers: ['sriovnicswitch','openvswitch']
  NeutronPluginExtensions: "qos,port_security"
-  NovaSchedulerEnabledFilters: ['AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
+  NovaSchedulerEnabledFilters:
+    - AvailabilityZoneFilter
+    - ComputeFilter
+    - ComputeCapabilitiesFilter
+    - ImagePropertiesFilter
+    - ServerGroupAntiAffinityFilter
+    - ServerGroupAffinityFilter
+    - PciPassthroughFilter
  NovaSchedulerAvailableFilters: ['nova.scheduler.filters.all_filters']
--- a/environments/undercloud-enable-nova.yaml
+++ b/environments/undercloud-enable-nova.yaml
@ -3,7 +3,14 @@

 parameter_defaults:
  NovaSchedulerAvailableFilters: 'tripleo_common.filters.list.tripleo_filters'
-  NovaSchedulerEnabledFilters: ['TripleOCapabilitiesFilter', 'ComputeCapabilitiesFilter', 'AvailabilityZoneFilter', 'ComputeFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter']
+  NovaSchedulerEnabledFilters:
+    - TripleOCapabilitiesFilter
+    - ComputeCapabilitiesFilter
+    - AvailabilityZoneFilter
+    - ComputeFilter
+    - ImagePropertiesFilter
+    - ServerGroupAntiAffinityFilter
+    - ServerGroupAffinityFilter
  NovaSchedulerMaxAttempts: 30
  # Disable compute auto disabling:
  # As part of Pike, nova introduced a change to have the nova-compute