From 617c297c395c05135b96129275e740e983bc885b Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Fri, 24 Jan 2025 09:50:28 +0100 Subject: [PATCH] Switch cinder uniquePodNames to true for DCN deployments This patch reverts the work done in [1], where uniquePodNames was added as a kustomization parameter for cinder and switched to false due to [2]. In addition, this patch fixes the way extraMounts Ceph secrets are accessed, and removes the not required "projected" key. [1] https://github.com/openstack-k8s-operators/architecture/pull/436 [2] https://issues.redhat.com/browse/OSPRH-11240 Signed-off-by: Francesco Pantano --- dt/dcn/edpm-post-ceph/nodeset/kustomization.yaml | 11 ----------- examples/dt/dcn/service-values.yaml | 7 ++----- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dt/dcn/edpm-post-ceph/nodeset/kustomization.yaml b/dt/dcn/edpm-post-ceph/nodeset/kustomization.yaml index d83184b7b..cde3eec08 100644 --- a/dt/dcn/edpm-post-ceph/nodeset/kustomization.yaml +++ b/dt/dcn/edpm-post-ceph/nodeset/kustomization.yaml @@ -112,17 +112,6 @@ replacements: - spec.cinder.template.cinderBackup.customServiceConfig options: create: true - - source: - kind: ConfigMap - name: service-values - fieldPath: data.cinder.uniquePodNames - targets: - - select: - kind: OpenStackControlPlane - fieldPaths: - - spec.cinder.uniquePodNames - options: - create: true - source: kind: ConfigMap name: service-values diff --git a/examples/dt/dcn/service-values.yaml b/examples/dt/dcn/service-values.yaml index 2e9aa527f..c514d5b67 100644 --- a/examples/dt/dcn/service-values.yaml +++ b/examples/dt/dcn/service-values.yaml @@ -12,7 +12,6 @@ data: customServiceConfig: | [DEFAULT] storage_availability_zone = az0 - uniquePodNames: false cinderAPI: replicas: 3 cinderBackup: @@ -353,10 +352,8 @@ data: extraVolType: Ceph volumes: - name: ceph - projected: - sources: - - secret: - name: ceph-conf-files + secret: + secretName: ceph-conf-files mounts: - name: ceph mountPath: /etc/ceph