Skip to content

Commit 524c85b

Browse files
committed
[DCN] Adding cinderBackups to controlplane
To deploy multiple cinder backups distributed across edge sites Removes the existing spec.cinder.template.cinderBackup (singluar) by setting repliacs to 0 and adds cinderBackups (plural) to controlplane Jira: OSPRH-28343 Signed-off-by: Gais Ameer <gameer@redhat.com>
1 parent 979ddd7 commit 524c85b

4 files changed

Lines changed: 81 additions & 10 deletions

File tree

dt/dcn/control-plane/kustomization.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,17 @@ replacements:
109109
- spec.cinder.template.cinderBackup.customServiceConfig
110110
options:
111111
create: true
112+
- source:
113+
kind: ConfigMap
114+
name: service-values
115+
fieldPath: data.cinderBackups
116+
targets:
117+
- select:
118+
kind: OpenStackControlPlane
119+
fieldPaths:
120+
- spec.cinder.template.cinderBackups
121+
options:
122+
create: true
112123
- source:
113124
kind: ConfigMap
114125
name: service-values

examples/dt/dcn/control-plane/kustomization.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,11 @@ components:
88
resources:
99
- networking/nncp/values.yaml
1010
- service-values.yaml
11+
12+
patches:
13+
- target:
14+
kind: OpenStackControlPlane
15+
patch: |-
16+
- op: add
17+
path: /spec/cinder/template/cinderBackups
18+
value: {}

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

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,33 @@ data:
2121
cinderAPI:
2222
replicas: 3
2323
cinderBackup:
24-
replicas: 3
24+
replicas: 0
2525
customServiceConfig: |
2626
[DEFAULT]
27-
backup_driver = cinder.backup.drivers.ceph.CephBackupDriver
28-
backup_ceph_conf = /etc/ceph/az0.conf
29-
backup_ceph_pool = backups
30-
backup_ceph_user = openstack
27+
# Not implemented in this example
28+
cinderBackups:
29+
az0:
30+
customServiceConfig: |
31+
[DEFAULT]
32+
storage_availability_zone = az0
33+
backup_driver = cinder.backup.drivers.ceph.CephBackupDriver
34+
backup_ceph_conf = /etc/ceph/az0.conf
35+
backup_ceph_pool = backups
36+
backup_ceph_user = openstack
37+
networkAttachments:
38+
- storage
39+
replicas: 2
40+
az2:
41+
customServiceConfig: |
42+
[DEFAULT]
43+
storage_availability_zone = az2
44+
backup_driver = cinder.backup.drivers.ceph.CephBackupDriver
45+
backup_ceph_conf = /etc/ceph/az2.conf
46+
backup_ceph_pool = backups
47+
backup_ceph_user = openstack
48+
networkAttachments:
49+
- storage
50+
replicas: 2
3151
cinderVolumes:
3252
az0:
3353
customServiceConfig: |

examples/dt/dcn/service-values.yaml

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,44 @@ data:
2222
cinderAPI:
2323
replicas: 3
2424
cinderBackup:
25-
replicas: 3
25+
replicas: 0
2626
customServiceConfig: |
2727
[DEFAULT]
28-
backup_driver = cinder.backup.drivers.ceph.CephBackupDriver
29-
backup_ceph_conf = /etc/ceph/az0.conf
30-
backup_ceph_pool = backups
31-
backup_ceph_user = openstack
28+
# Not implemented in this example
29+
cinderBackups:
30+
az0:
31+
customServiceConfig: |
32+
[DEFAULT]
33+
storage_availability_zone = az0
34+
backup_driver = cinder.backup.drivers.ceph.CephBackupDriver
35+
backup_ceph_conf = /etc/ceph/az0.conf
36+
backup_ceph_pool = backups
37+
backup_ceph_user = openstack
38+
networkAttachments:
39+
- storage
40+
replicas: 2
41+
az1:
42+
customServiceConfig: |
43+
[DEFAULT]
44+
storage_availability_zone = az1
45+
backup_driver = cinder.backup.drivers.ceph.CephBackupDriver
46+
backup_ceph_conf = /etc/ceph/az1.conf
47+
backup_ceph_pool = backups
48+
backup_ceph_user = openstack
49+
networkAttachments:
50+
- storage
51+
replicas: 2
52+
az2:
53+
customServiceConfig: |
54+
[DEFAULT]
55+
storage_availability_zone = az2
56+
backup_driver = cinder.backup.drivers.ceph.CephBackupDriver
57+
backup_ceph_conf = /etc/ceph/az2.conf
58+
backup_ceph_pool = backups
59+
backup_ceph_user = openstack
60+
networkAttachments:
61+
- storage
62+
replicas: 2
3263
cinderVolumes:
3364
az0:
3465
customServiceConfig: |
@@ -439,6 +470,7 @@ data:
439470
- propagation:
440471
- CinderVolume
441472
- CinderBackup
473+
- CinderBackups
442474
- GlanceAPI
443475
- ManilaShare
444476
extraVolType: Ceph

0 commit comments

Comments
 (0)