From 9c9500938180369ffff7b6e4bfdf58866a3a45a4 Mon Sep 17 00:00:00 2001 From: John Fulton Date: Tue, 3 Dec 2024 08:47:57 -0500 Subject: [PATCH] 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 --- roles/ci_dcn_site/templates/service-values.yaml.j2 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/roles/ci_dcn_site/templates/service-values.yaml.j2 b/roles/ci_dcn_site/templates/service-values.yaml.j2 index 4c4d684c37..5bed7a61b8 100644 --- a/roles/ci_dcn_site/templates/service-values.yaml.j2 +++ b/roles/ci_dcn_site/templates/service-values.yaml.j2 @@ -10,11 +10,11 @@ data: preserveJobs: false cinder: uniquePodNames: false - cinderAPI: - replicas: 3 customServiceConfig: | [DEFAULT] - default_availability_zone = az0 + storage_availability_zone = az0 + cinderAPI: + replicas: 3 cinderBackup: replicas: 3 customServiceConfig: | @@ -23,7 +23,6 @@ data: backup_ceph_conf = /etc/ceph/az0.conf backup_ceph_pool = backups backup_ceph_user = openstack - storage_availability_zone = az0 cinderVolumes: {% for _ceph in _ceph_vars_list %} {{ _ceph.cifmw_ceph_client_cluster }}: