From 67a08dee5de34fae2bfb4553ffb7371dbdf55ac8 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Fri, 28 Aug 2020 21:05:50 +0530 Subject: [PATCH] Remove usage of RetryFilter RetryFilter was deprecated in Train and is now removed[1] from nova, so let's cleanup it's usage. [1] https://review.opendev.org/#/c/744800 Change-Id: I2e1b3b965c52495eb9c1315857ff30066c42c33e (cherry picked from commit ccee58a60a48b70fe05802b22873075f8c4d7457) --- environments/cavium-liquidio.yaml | 2 +- environments/ovs-hw-offload.yaml | 2 +- environments/services-baremetal/neutron-sriov.yaml | 2 +- environments/services/neutron-mlnx-agent.yaml | 2 +- environments/services/neutron-ovn-sriov.yaml | 2 +- environments/services/neutron-sriov.yaml | 2 +- environments/undercloud.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/environments/cavium-liquidio.yaml b/environments/cavium-liquidio.yaml index 0132b5f33f..7f83f62654 100644 --- a/environments/cavium-liquidio.yaml +++ b/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: ['RetryFilter', 'AvailabilityZoneFilter', 'ComputeFilter', 'ComputeCapabilitiesFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter', 'PciPassthroughFilter'] + #NovaSchedulerDefaultFilters: ['AvailabilityZoneFilter', 'ComputeFilter', 'ComputeCapabilitiesFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter', 'PciPassthroughFilter'] #NovaPCIPassthrough: # - address: "*:02:00.*" diff --git a/environments/ovs-hw-offload.yaml b/environments/ovs-hw-offload.yaml index d9999f6d0d..2cce25fe09 100644 --- a/environments/ovs-hw-offload.yaml +++ b/environments/ovs-hw-offload.yaml @@ -4,7 +4,7 @@ parameter_defaults: - NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter','NUMATopologyFilter'] + NovaSchedulerDefaultFilters: ['AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter','NUMATopologyFilter'] NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"] #NovaPCIPassthrough: # - devname: "ens3f0" diff --git a/environments/services-baremetal/neutron-sriov.yaml b/environments/services-baremetal/neutron-sriov.yaml index 3f7e36be7a..ff1942001b 100644 --- a/environments/services-baremetal/neutron-sriov.yaml +++ b/environments/services-baremetal/neutron-sriov.yaml @@ -6,5 +6,5 @@ resource_registry: parameter_defaults: NeutronMechanismDrivers: ['sriovnicswitch','openvswitch'] NeutronPluginExtensions: "qos,port_security" - NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter'] + NovaSchedulerDefaultFilters: ['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-mlnx-agent.yaml b/environments/services/neutron-mlnx-agent.yaml index 2495b48cc1..27e84c3e68 100644 --- a/environments/services/neutron-mlnx-agent.yaml +++ b/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: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter', 'NUMATopologyFilter'] + NovaSchedulerDefaultFilters: ['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' diff --git a/environments/services/neutron-ovn-sriov.yaml b/environments/services/neutron-ovn-sriov.yaml index 8a2efb4649..0b396ed6e8 100644 --- a/environments/services/neutron-ovn-sriov.yaml +++ b/environments/services/neutron-ovn-sriov.yaml @@ -12,7 +12,7 @@ resource_registry: parameter_defaults: NeutronMechanismDrivers: ['sriovnicswitch','ovn'] - NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter'] + NovaSchedulerDefaultFilters: ['AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter'] NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"] ControllerSriovParameters: OVNCMSOptions: "enable-chassis-as-gw" diff --git a/environments/services/neutron-sriov.yaml b/environments/services/neutron-sriov.yaml index 3f7e36be7a..ff1942001b 100644 --- a/environments/services/neutron-sriov.yaml +++ b/environments/services/neutron-sriov.yaml @@ -6,5 +6,5 @@ resource_registry: parameter_defaults: NeutronMechanismDrivers: ['sriovnicswitch','openvswitch'] NeutronPluginExtensions: "qos,port_security" - NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter'] + NovaSchedulerDefaultFilters: ['AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter'] NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"] diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml index 70b2f2f581..06720032d6 100644 --- a/environments/undercloud.yaml +++ b/environments/undercloud.yaml @@ -87,7 +87,7 @@ parameter_defaults: NeutronAgentExtensions: [] NeutronFlatNetworks: '*' NovaSchedulerAvailableFilters: 'tripleo_common.filters.list.tripleo_filters' - NovaSchedulerDefaultFilters: ['RetryFilter', 'TripleOCapabilitiesFilter', 'ComputeCapabilitiesFilter', 'AvailabilityZoneFilter', 'ComputeFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter'] + NovaSchedulerDefaultFilters: ['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