Skip to content

Commit 9c95009

Browse files
fultonjopenshift-merge-bot[bot]
authored andcommitted
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. The backend_availability_zone is kept inside of the cinderVolumes loop since it needs to be set for other AZs. There's no harm in letting the loop set it for az0 and it's simpler to do that than add a conditional. Jira: https://issues.redhat.com/browse/OSPRH-11915 Signed-off-by: John Fulton <[email protected]>
1 parent 5639bc4 commit 9c95009

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

roles/ci_dcn_site/templates/service-values.yaml.j2

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ data:
1010
preserveJobs: false
1111
cinder:
1212
uniquePodNames: false
13-
cinderAPI:
14-
replicas: 3
1513
customServiceConfig: |
1614
[DEFAULT]
17-
default_availability_zone = az0
15+
storage_availability_zone = az0
16+
cinderAPI:
17+
replicas: 3
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
{% for _ceph in _ceph_vars_list %}
2928
{{ _ceph.cifmw_ceph_client_cluster }}:

0 commit comments

Comments
 (0)