[DCN] Support Manila Shares with Local Ceph Clusters in DCN

This update enables deploying three Manila shares, each connected to its local Ceph cluster within the same availability zone (AZ). In DCN, each "site" is configured to use its respective local Ceph cluster.
openstack-k8s-operators · Dec 19, 2024 · 58efc95 · 58efc95
1 parent 163f30f
commit 58efc95
Show file tree

Hide file tree

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

diff --git a/examples/dt/dcn/service-values.yaml b/examples/dt/dcn/service-values.yaml
@@ -196,13 +196,43 @@ data:
         replicas: 1
         type: edge
   manila:
-    enabled: false
+    enabled: true
     manilaAPI:
       customServiceConfig: |
         [DEFAULT]
         enabled_share_protocols=nfs,cephfs
     manilaShares:
-      share1:
+      az0:
+        customServiceConfig: |
+          [DEFAULT]
+          enabled_share_backends = cephfs
+          enabled_share_protocols = cephfs
+          [cephfs]
+          driver_handles_share_servers = False
+          share_backend_name = cephfs
+          share_driver = manila.share.drivers.cephfs.driver.CephFSDriver
+          cephfs_conf_path = /etc/ceph/az0.conf
+          cephfs_cluster_name = ceph
+          cephfs_auth_id=openstack
+          cephfs_volume_mode = 0755
+          cephfs_protocol_helper_type = CEPHFS
+          storage_availability_zone = az0
+      az1:
+        customServiceConfig: |
+          [DEFAULT]
+          enabled_share_backends = cephfs
+          enabled_share_protocols = cephfs
+          [cephfs]
+          driver_handles_share_servers = False
+          share_backend_name = cephfs
+          share_driver = manila.share.drivers.cephfs.driver.CephFSDriver
+          cephfs_conf_path = /etc/ceph/az1.conf
+          cephfs_cluster_name = ceph
+          cephfs_auth_id=openstack
+          cephfs_volume_mode = 0755
+          cephfs_protocol_helper_type = CEPHFS
+          storage_availability_zone = az1
+      az2:
         customServiceConfig: |
           [DEFAULT]
           enabled_share_backends = cephfs
@@ -211,11 +241,12 @@ data:
           driver_handles_share_servers = False
           share_backend_name = cephfs
           share_driver = manila.share.drivers.cephfs.driver.CephFSDriver
-          cephfs_conf_path = /etc/ceph/ceph.conf
+          cephfs_conf_path = /etc/ceph/az2.conf
           cephfs_cluster_name = ceph
           cephfs_auth_id=openstack
           cephfs_volume_mode = 0755
           cephfs_protocol_helper_type = CEPHFS
+          storage_availability_zone = az2
   neutron:
     template:
       customServiceConfig: |