Merge pull request #153 from Jaganathancse/glance_controlplane_changes

telemetry, glance swift and ovn controller controlplane configs
openstack-k8s-operators · Apr 2, 2024 · 5e13376 · 5e13376
2 parents df8abc7 + d28aa8d
commit 5e13376
Show file tree

Hide file tree

Showing 6 changed files with 149 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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