From e9d4fa444f5679c30dd74bab27da247477f7a3ea Mon Sep 17 00:00:00 2001 From: afazekas Date: Wed, 24 Apr 2024 13:37:34 +0200 Subject: [PATCH] Remove extra nova filters The default service filters supposed to be enough, no need for these options. --- dt/uni01alpha/kustomization.yaml | 12 ------------ .../dt/uni01alpha/control-plane/service-values.yaml | 7 ------- .../dt/uni06zeta/control-plane/service-values.yaml | 5 ----- 3 files changed, 24 deletions(-) diff --git a/dt/uni01alpha/kustomization.yaml b/dt/uni01alpha/kustomization.yaml index 3352b20a0..5173d3e14 100644 --- a/dt/uni01alpha/kustomization.yaml +++ b/dt/uni01alpha/kustomization.yaml @@ -338,18 +338,6 @@ replacements: options: create: true - - source: - kind: ConfigMap - name: service-values - fieldPath: data.nova.schedulerServiceTemplate.customServiceConfig - targets: - - select: - kind: OpenStackControlPlane - fieldPaths: - - spec.nova.template.schedulerServiceTemplate.customServiceConfig - options: - create: true - - source: kind: ConfigMap name: network-values diff --git a/examples/dt/uni01alpha/control-plane/service-values.yaml b/examples/dt/uni01alpha/control-plane/service-values.yaml index 042c22ab5..55071b900 100644 --- a/examples/dt/uni01alpha/control-plane/service-values.yaml +++ b/examples/dt/uni01alpha/control-plane/service-values.yaml @@ -135,10 +135,3 @@ data: [ml2] type_drivers = geneve,vxlan,vlan,flat tenant_network_types = geneve,flat - - # yamllint disable rule:line-length - nova: - schedulerServiceTemplate: - customServiceConfig: | - [filter_scheduler] - enabled_filters = AggregateInstanceExtraSpecsFilter,AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,DifferentHostFilter,SameHostFilter,AllHostsFilter,ServerGroupAffinityFilter,ServerGroupAntiAffinityFilter diff --git a/examples/dt/uni06zeta/control-plane/service-values.yaml b/examples/dt/uni06zeta/control-plane/service-values.yaml index 8b6212e47..75f20f311 100644 --- a/examples/dt/uni06zeta/control-plane/service-values.yaml +++ b/examples/dt/uni06zeta/control-plane/service-values.yaml @@ -118,8 +118,3 @@ data: max_header_size = 38 [ml2_type_vlan] network_vlan_ranges = tenant:1000:2000,datacentre:218:218 - - nova: - customServiceConfig: | - [filter_scheduler] - enabled_filters = AggregateInstanceExtraSpecsFilter, AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,DifferentHostFilter,SameHostFilter,AllHostsFilter,ServerGroupAffinityFilter,ServerGroupAntiAffinityFilter