Skip to content

Commit

Permalink
Set Cinder customServiceConfig globally in DCN DT
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
fultonj authored and openshift-merge-bot[bot] committed Dec 10, 2024
1 parent 5639bc4 commit 9c95009
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions roles/ci_dcn_site/templates/service-values.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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 }}:
Expand Down

0 comments on commit 9c95009

Please sign in to comment.