From d28aa8d724fd393a9b61d88dbbfe4de3d64bdfdb Mon Sep 17 00:00:00 2001 From: Jaganathan Palanisamy Date: Tue, 2 Apr 2024 17:54:09 +0530 Subject: [PATCH] telemetry, glance swift and ovn controller controlplane configs This change is to fix telemetry, glance, swift and ovn controller controlplane custom configurations. --- .../va/nfv/ovs-dpdk-sriov/service-values.yaml | 6 ++ examples/va/nfv/ovs-dpdk/service-values.yaml | 5 ++ examples/va/nfv/sriov/service-values.yaml | 4 ++ va/nfv/ovs-dpdk-sriov/kustomization.yaml | 67 +++++++++++++++++++ va/nfv/ovs-dpdk/kustomization.yaml | 55 +++++++++++++++ va/nfv/sriov/kustomization.yaml | 12 ++++ 6 files changed, 149 insertions(+) diff --git a/examples/va/nfv/ovs-dpdk-sriov/service-values.yaml b/examples/va/nfv/ovs-dpdk-sriov/service-values.yaml index 557beea1b..1bb0b3782 100644 --- a/examples/va/nfv/ovs-dpdk-sriov/service-values.yaml +++ b/examples/va/nfv/ovs-dpdk-sriov/service-values.yaml @@ -53,3 +53,9 @@ data: replicas: 1 swift: enabled: true + telemetry: + enabled: true + template: + ceilometer: + enabled: true + diff --git a/examples/va/nfv/ovs-dpdk/service-values.yaml b/examples/va/nfv/ovs-dpdk/service-values.yaml index eb528e1a0..e507d0abf 100644 --- a/examples/va/nfv/ovs-dpdk/service-values.yaml +++ b/examples/va/nfv/ovs-dpdk/service-values.yaml @@ -53,3 +53,8 @@ data: replicas: 1 swift: enabled: true + telemetry: + enabled: true + template: + ceilometer: + enabled: true diff --git a/examples/va/nfv/sriov/service-values.yaml b/examples/va/nfv/sriov/service-values.yaml index 11c00179e..b83ed96d7 100644 --- a/examples/va/nfv/sriov/service-values.yaml +++ b/examples/va/nfv/sriov/service-values.yaml @@ -12,6 +12,10 @@ data: mechanism_drivers = ovn,sriovnicswitch [ml2_type_vlan] network_vlan_ranges = sriov-phy4 + ovn: + ovnController: + nicMappings: + datacentre: enp4s0 # CHANGEME glance: customServiceConfig: | [DEFAULT] diff --git a/va/nfv/ovs-dpdk-sriov/kustomization.yaml b/va/nfv/ovs-dpdk-sriov/kustomization.yaml index b28b64757..c6783f4f6 100644 --- a/va/nfv/ovs-dpdk-sriov/kustomization.yaml +++ b/va/nfv/ovs-dpdk-sriov/kustomization.yaml @@ -33,3 +33,70 @@ replacements: - spec.neutron.template.customServiceConfig options: create: true +# OVN control plane OvS DPDK customization +- source: + kind: ConfigMap + name: service-values + fieldPath: data.ovn.ovnController + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.ovn.template.ovnController + options: + create: true +- source: + kind: ConfigMap + name: service-values + fieldPath: data.glance.customServiceConfig + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.glance.template.customServiceConfig + options: + create: true +- source: + kind: ConfigMap + name: service-values + fieldPath: data.glance.default.replicas + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.glance.template.glanceAPIs.default.replicas + options: + create: true +- source: + kind: ConfigMap + name: service-values + fieldPath: data.swift.enabled + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.swift.enabled + options: + create: true +- source: + kind: ConfigMap + name: service-values + fieldPath: data.telemetry.enabled + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.telemetry.enabled + options: + create: true +- source: + kind: ConfigMap + name: service-values + fieldPath: data.telemetry.template.ceilometer.enabled + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.telemetry.template.ceilometer.enabled + options: + create: true diff --git a/va/nfv/ovs-dpdk/kustomization.yaml b/va/nfv/ovs-dpdk/kustomization.yaml index 7cc0c3a54..4f35ea3bb 100644 --- a/va/nfv/ovs-dpdk/kustomization.yaml +++ b/va/nfv/ovs-dpdk/kustomization.yaml @@ -45,3 +45,58 @@ replacements: - spec.ovn.template.ovnController options: create: true +- source: + kind: ConfigMap + name: service-values + fieldPath: data.glance.customServiceConfig + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.glance.template.customServiceConfig + options: + create: true +- source: + kind: ConfigMap + name: service-values + fieldPath: data.glance.default.replicas + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.glance.template.glanceAPIs.default.replicas + options: + create: true +- source: + kind: ConfigMap + name: service-values + fieldPath: data.swift.enabled + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.swift.enabled + options: + create: true +- source: + kind: ConfigMap + name: service-values + fieldPath: data.telemetry.enabled + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.telemetry.enabled + options: + create: true +- source: + kind: ConfigMap + name: service-values + fieldPath: data.telemetry.template.ceilometer.enabled + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.telemetry.template.ceilometer.enabled + options: + create: true diff --git a/va/nfv/sriov/kustomization.yaml b/va/nfv/sriov/kustomization.yaml index 975bd7ccb..62e8f1999 100644 --- a/va/nfv/sriov/kustomization.yaml +++ b/va/nfv/sriov/kustomization.yaml @@ -33,6 +33,18 @@ replacements: - spec.neutron.template.customServiceConfig options: create: true +# OVN control plane SRIOV customization +- source: + kind: ConfigMap + name: service-values + fieldPath: data.ovn.ovnController + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.ovn.template.ovnController + options: + create: true - source: kind: ConfigMap name: service-values