Skip to content

Commit 1c64180

Browse files
committed
Glance DCN: Remove unnecessary configuration and default to az0
- Remove the `customServiceConfig` from the Glance template since it's different for each Glance API pod. - Remove undefined backends from `enabled_backends` in az1 and az2 - Call the glance backend at AZ0 `az0` instead of `default`. Signed-off-by: John Fulton <[email protected]>
1 parent 2b53bd2 commit 1c64180

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@ replacements:
125125
- source:
126126
kind: ConfigMap
127127
name: service-values
128-
fieldPath: data.glance.customServiceConfig
128+
fieldPath: data.glance.keystoneEndpoint
129129
targets:
130130
- select:
131131
kind: OpenStackControlPlane
132132
fieldPaths:
133-
- spec.glance.template.customServiceConfig
133+
- spec.glance.template.keystoneEndpoint
134134
options:
135135
create: true
136136
- source:

examples/dt/dcn/service-values.yaml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,9 @@ data:
6666
rbd_cluster_name = az2
6767
backend_availability_zone = az2
6868
glance:
69-
customServiceConfig: |
70-
[DEFAULT]
71-
enabled_backends = default_backend:rbd
72-
[glance_store]
73-
default_backend = default_backend
74-
[default_backend]
75-
rbd_store_ceph_conf = /etc/ceph/az0.conf
76-
store_description = "RBD backend"
77-
rbd_store_pool = images
78-
rbd_store_user = openstack
79-
rbd_thin_provisioning = True
69+
keystoneEndpoint: az0
8070
glanceAPIs:
81-
default:
71+
az0:
8272
customServiceConfig: |
8373
[DEFAULT]
8474
enabled_import_methods = [web-download,copy-image,glance-direct]
@@ -121,7 +111,7 @@ data:
121111
customServiceConfig: |
122112
[DEFAULT]
123113
enabled_import_methods = [web-download,copy-image,glance-direct]
124-
enabled_backends = az0:rbd,az1:rbd,az2:rbd
114+
enabled_backends = az0:rbd,az1:rbd
125115
[glance_store]
126116
default_backend = az1
127117
[az1]
@@ -154,7 +144,7 @@ data:
154144
customServiceConfig: |
155145
[DEFAULT]
156146
enabled_import_methods = [web-download,copy-image,glance-direct]
157-
enabled_backends = az0:rbd,az1:rbd,az2:rbd
147+
enabled_backends = az0:rbd,az2:rbd
158148
[glance_store]
159149
default_backend = az2
160150
[az2]

0 commit comments

Comments
 (0)