Merge pull request #463 from openshift-cherrypick-robot/cherry-pick-4…

…59-to-18.0-fr1 [18.0-fr1] Set Cinder customServiceConfig globally in DCN DT This is an automated cherry-pick of #459 /assign fultonj Reviewed-by: Andrew Bays <[email protected]>
openstack-k8s-operators · Dec 12, 2024 · 78b9678 · 78b9678
2 parents 3764207 + 67ca620
commit 78b9678
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/dt/dcn/edpm-post-ceph/nodeset/kustomization.yaml b/dt/dcn/edpm-post-ceph/nodeset/kustomization.yaml
@@ -148,12 +148,12 @@ replacements:
   - source:
       kind: ConfigMap
       name: service-values
-      fieldPath: data.cinderAPI.customServiceConfig
+      fieldPath: data.cinder.customServiceConfig
     targets:
       - select:
           kind: OpenStackControlPlane
         fieldPaths:
-          - spec.cinder.template.cinderAPI.customServiceConfig
+          - spec.cinder.template.customServiceConfig
         options:
           create: true
   - source:

diff --git a/examples/dt/dcn/service-values.yaml b/examples/dt/dcn/service-values.yaml
@@ -9,12 +9,12 @@ metadata:
 data:
   preserveJobs: false
   cinder:
+    customServiceConfig: |
+      [DEFAULT]
+      storage_availability_zone = az0
     uniquePodNames: false
   cinderAPI:
     replicas: 3
-    customServiceConfig: |
-      [DEFAULT]
-      default_availability_zone = az0
   cinderBackup:
     replicas: 3
     customServiceConfig: |
@@ -23,7 +23,6 @@ data:
       backup_ceph_conf = /etc/ceph/az0.conf
       backup_ceph_pool = backups
       backup_ceph_user = openstack
-      storage_availability_zone = az0
   cinderVolumes:
     az0:
       customServiceConfig: |