Skip to content

Commit ef1d06f

Browse files
committed
Set Cinder customServiceConfig globally in DCN DT
The customServiceConfig for cinder in the DCN DT is used to set the storage_availability_zone. We wish to do this for all Cinder services in the default site (`az0`), not just for cinderAPI or cinderBackup as the AZ was missing from the cinder-scheduler. Thus, we will move it to the global section under the cinder template and out of the cinderAPI and cinderBackup since they will inherit it. We still need to set the backend_availability_zone in all cinderVolumes except az0 since it will also inherit the new default value. However, the additional line is kept in az0's customServiceConfig to make the pattern easier to see for az0, az1, az2, etc. Jira: https://issues.redhat.com/browse/OSPRH-11915 Signed-off-by: John Fulton <[email protected]>
1 parent d82dcc2 commit ef1d06f

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

dt/dcn/edpm-post-ceph/nodeset/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,12 @@ replacements:
148148
- source:
149149
kind: ConfigMap
150150
name: service-values
151-
fieldPath: data.cinderAPI.customServiceConfig
151+
fieldPath: data.cinder.customServiceConfig
152152
targets:
153153
- select:
154154
kind: OpenStackControlPlane
155155
fieldPaths:
156-
- spec.cinder.template.cinderAPI.customServiceConfig
156+
- spec.cinder.template.customServiceConfig
157157
options:
158158
create: true
159159
- source:

examples/dt/dcn/service-values.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ metadata:
99
data:
1010
preserveJobs: false
1111
cinder:
12+
customServiceConfig: |
13+
[DEFAULT]
14+
storage_availability_zone = az0
1215
uniquePodNames: false
1316
cinderAPI:
1417
replicas: 3
15-
customServiceConfig: |
16-
[DEFAULT]
17-
default_availability_zone = az0
1818
cinderBackup:
1919
replicas: 3
2020
customServiceConfig: |
@@ -23,7 +23,6 @@ data:
2323
backup_ceph_conf = /etc/ceph/az0.conf
2424
backup_ceph_pool = backups
2525
backup_ceph_user = openstack
26-
storage_availability_zone = az0
2726
cinderVolumes:
2827
az0:
2928
customServiceConfig: |

0 commit comments

Comments
 (0)