Skip to content

Commit 6963228

Browse files
lkuchlanfultonj
authored andcommitted
[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.
1 parent 9211479 commit 6963228

File tree

3 files changed

+79
-16
lines changed

3 files changed

+79
-16
lines changed

dt/dcn/control-plane/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,12 @@ replacements:
179179
- source:
180180
kind: ConfigMap
181181
name: service-values
182-
fieldPath: data.manila.manilaShares.share1.customServiceConfig
182+
fieldPath: data.manila.manilaShares
183183
targets:
184184
- select:
185185
kind: OpenStackControlPlane
186186
fieldPaths:
187-
- spec.manila.template.manilaShares.share1.customServiceConfig
187+
- spec.manila.template.manilaShares
188188
options:
189189
create: true
190190
- source:

examples/dt/dcn/control-plane/scaledown/service-values.yaml

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,26 +136,49 @@ data:
136136
replicas: 1
137137
type: edge
138138
manila:
139-
enabled: false
139+
customServiceConfig: |
140+
[DEFAULT]
141+
storage_availability_zone = az0
142+
enabled: true
140143
manilaAPI:
141144
customServiceConfig: |
142145
[DEFAULT]
143146
enabled_share_protocols=nfs,cephfs
144147
manilaShares:
145-
share1:
148+
az0:
149+
customServiceConfig: |
150+
[DEFAULT]
151+
enabled_share_backends = cephfs_az0
152+
enabled_share_protocols = cephfs
153+
[cephfs_az0]
154+
driver_handles_share_servers = False
155+
share_backend_name = cephfs_az0
156+
share_driver = manila.share.drivers.cephfs.driver.CephFSDriver
157+
cephfs_conf_path = /etc/ceph/az0.conf
158+
cephfs_cluster_name = az0
159+
cephfs_auth_id=openstack
160+
cephfs_volume_mode = 0755
161+
cephfs_protocol_helper_type = CEPHFS
162+
backend_availability_zone = az0
163+
networkAttachments:
164+
- storage
165+
az2:
146166
customServiceConfig: |
147167
[DEFAULT]
148-
enabled_share_backends = cephfs
168+
enabled_share_backends = cephfs_az2
149169
enabled_share_protocols = cephfs
150-
[cephfs]
170+
[cephfs_az2]
151171
driver_handles_share_servers = False
152-
share_backend_name = cephfs
172+
share_backend_name = cephfs_az2
153173
share_driver = manila.share.drivers.cephfs.driver.CephFSDriver
154-
cephfs_conf_path = /etc/ceph/ceph.conf
155-
cephfs_cluster_name = ceph
174+
cephfs_conf_path = /etc/ceph/az2.conf
175+
cephfs_cluster_name = az2
156176
cephfs_auth_id=openstack
157177
cephfs_volume_mode = 0755
158178
cephfs_protocol_helper_type = CEPHFS
179+
backend_availability_zone = az2
180+
networkAttachments:
181+
- storage
159182
neutron:
160183
template:
161184
customServiceConfig: |

examples/dt/dcn/service-values.yaml

Lines changed: 47 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -195,26 +195,66 @@ data:
195195
replicas: 1
196196
type: edge
197197
manila:
198-
enabled: false
198+
customServiceConfig: |
199+
[DEFAULT]
200+
storage_availability_zone = az0
201+
enabled: true
199202
manilaAPI:
200203
customServiceConfig: |
201204
[DEFAULT]
202205
enabled_share_protocols=nfs,cephfs
203206
manilaShares:
204-
share1:
207+
az0:
208+
customServiceConfig: |
209+
[DEFAULT]
210+
enabled_share_backends = cephfs_az0
211+
enabled_share_protocols = cephfs
212+
[cephfs_az0]
213+
driver_handles_share_servers = False
214+
share_backend_name = cephfs_az0
215+
share_driver = manila.share.drivers.cephfs.driver.CephFSDriver
216+
cephfs_conf_path = /etc/ceph/az0.conf
217+
cephfs_cluster_name = az0
218+
cephfs_auth_id=openstack
219+
cephfs_volume_mode = 0755
220+
cephfs_protocol_helper_type = CEPHFS
221+
backend_availability_zone = az0
222+
networkAttachments:
223+
- storage
224+
az1:
225+
customServiceConfig: |
226+
[DEFAULT]
227+
enabled_share_backends = cephfs_az1
228+
enabled_share_protocols = cephfs
229+
[cephfs_az1]
230+
driver_handles_share_servers = False
231+
share_backend_name = cephfs_az1
232+
share_driver = manila.share.drivers.cephfs.driver.CephFSDriver
233+
cephfs_conf_path = /etc/ceph/az1.conf
234+
cephfs_cluster_name = az1
235+
cephfs_auth_id=openstack
236+
cephfs_volume_mode = 0755
237+
cephfs_protocol_helper_type = CEPHFS
238+
backend_availability_zone = az1
239+
networkAttachments:
240+
- storage
241+
az2:
205242
customServiceConfig: |
206243
[DEFAULT]
207-
enabled_share_backends = cephfs
244+
enabled_share_backends = cephfs_az2
208245
enabled_share_protocols = cephfs
209-
[cephfs]
246+
[cephfs_az2]
210247
driver_handles_share_servers = False
211-
share_backend_name = cephfs
248+
share_backend_name = cephfs_az2
212249
share_driver = manila.share.drivers.cephfs.driver.CephFSDriver
213-
cephfs_conf_path = /etc/ceph/ceph.conf
214-
cephfs_cluster_name = ceph
250+
cephfs_conf_path = /etc/ceph/az2.conf
251+
cephfs_cluster_name = az2
215252
cephfs_auth_id=openstack
216253
cephfs_volume_mode = 0755
217254
cephfs_protocol_helper_type = CEPHFS
255+
backend_availability_zone = az2
256+
networkAttachments:
257+
- storage
218258
neutron:
219259
template:
220260
customServiceConfig: |

0 commit comments

Comments
 (0)