Merge "Removing scheduler_default_filters for Nova"

deployment/nova/nova-scheduler-container-puppet.yaml

@@ -45,11 +45,11 @@ parameters:
     default: []
     description: List of scheduler available filters
     type: comma_delimited_list
-  NovaSchedulerDefaultFilters:
+  NovaSchedulerEnabledFilters:
     type: comma_delimited_list
     default: []
     description: >
-      An array of filters used by Nova to filter a node.These filters will be
+      An array of filters used by Nova to filter a node. These filters will be
       applied in the order they are listed, so place your most restrictive
       filters first to make the filtering process more efficient.
   NovaSchedulerMaxAttempts:
@@ -113,10 +113,33 @@ parameters:
       key of availability zone set to the value provided by incoming request, and
       request result from placement be limited to that aggregate.
     type: boolean
+  # DEPRECATED: the following options are deprecated and are currently maintained
+  # for backwards compatibility. They will be removed in future release.
+  NovaSchedulerDefaultFilters:
+    type: comma_delimited_list
+    default: []
+    description: >
+      (DEPRECATED) An array of filters used by Nova to filter a node. These
+      filters will be applied in the order they are listed, so place your most
+      restrictive filters first to make the filtering process more efficient.
+
 
 
 conditions:
   nova_scheduler_workers_zero: {equals : [{get_param: NovaSchedulerWorkers}, 0]}
+  scheduler_default_filters: {not: {equals: [{get_param: NovaSchedulerDefaultFilters}, []]}}
+  disabled_scheduler_enabled_filters: {equals: [{get_param: NovaSchedulerEnabledFilters}, []]}
+
+
+parameter_groups:
+- label: deprecated
+  description: |
+    The following parameters are deprecated and will be removed. They should not
+    be relied on for new deployments. If you have concerns regarding deprecated
+    parameters, please contact the TripleO development team on IRC or the
+    Openstack mailing list.
+  parameters:
+  - NovaSchedulerDefaultFilters
 
 resources:
 
@@ -176,7 +199,11 @@ outputs:
           - get_attr: [NovaDBClient, role_data, config_settings]
           - get_attr: [NovaLogging, config_settings]
           - nova::scheduler::filter::scheduler_available_filters: {get_param: NovaSchedulerAvailableFilters}
-            nova::scheduler::filter::scheduler_default_filters: {get_param: NovaSchedulerDefaultFilters}
+            nova::scheduler::filter::scheduler_enabled_filters:
+              if:
+              - and: [scheduler_default_filters, disabled_scheduler_enabled_filters]
+              - {get_param: NovaSchedulerDefaultFilters}
+              - {get_param: NovaSchedulerEnabledFilters}
             nova::scheduler::filter::scheduler_max_attempts: {get_param: NovaSchedulerMaxAttempts}
             nova::scheduler::discover_hosts_in_cells_interval: {get_param: NovaSchedulerDiscoverHostsInCellsInterval}
             nova::scheduler::query_placement_for_image_type_support: {get_param: NovaSchedulerQueryImageType}

environments/cavium-liquidio.yaml

@@ -10,7 +10,7 @@ parameter_defaults:
    ComputeLiquidioParameters:
      KernelArgs: "intel_iommu=on iommu=pt"
      NovaOVSDBConnection: "tcp:127.0.0.1:6640"
-   #NovaSchedulerDefaultFilters: ['AvailabilityZoneFilter', 'ComputeFilter', 'ComputeCapabilitiesFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter', 'PciPassthroughFilter']
+   #NovaSchedulerEnabledFilters: ['AvailabilityZoneFilter', 'ComputeFilter', 'ComputeCapabilitiesFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter', 'PciPassthroughFilter']
    #NovaPCIPassthrough:
    #  - address: "*:02:00.*"
 

environments/ovs-hw-offload.yaml

@@ -4,7 +4,7 @@
 
 parameter_defaults:
 
-  NovaSchedulerDefaultFilters: ['AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter','NUMATopologyFilter']
+  NovaSchedulerEnabledFilters: ['AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter','NUMATopologyFilter']
   NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
   #NovaPCIPassthrough:
   #  - devname: "ens3f0"

environments/services-baremetal/neutron-sriov.yaml

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

environments/services/neutron-mlnx-agent.yaml

@@ -8,7 +8,7 @@ parameter_defaults:
   NeutronMechanismDrivers: ['mlnx_sdn_assist','mlnx_infiniband']
   NeutronPluginExtensions: "qos,port_security"
   NeutronPhysicalDevMappings: ['datacentre:ib0']
-  NovaSchedulerDefaultFilters: ['AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter', 'NUMATopologyFilter']
+  NovaSchedulerEnabledFilters: ['AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter', 'NUMATopologyFilter']
   NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
   MultiInterfaceEnabled: true
   BindNormalPortsPhysnet: 'datacentre'

environments/services/neutron-ovn-sriov.yaml

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

environments/services/neutron-ovs-dpdk.yaml

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

environments/services/neutron-sriov.yaml

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

environments/undercloud-enable-nova.yaml

@@ -3,7 +3,7 @@
 
 parameter_defaults:
   NovaSchedulerAvailableFilters: 'tripleo_common.filters.list.tripleo_filters'
-  NovaSchedulerDefaultFilters: ['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

releasenotes/notes/deprecate-nova-scheduler_default_filters-122a7448d808dd82.yaml

@@ -0,0 +1,9 @@
+---
+features:
+  - |
+    Introducing the new ``NovaSchedulerEnabledFilters`` based on the new nova
+    parameter ``filter_scheduler.enabled_filters``.
+deprecations:
+  - |
+    Deprecating ``NovaSchedulerDefaultFilters``, it's replaced with the new
+    setting, ``NovaSchedulerEnabledFilters``.