openstack/openstack-helm
Code Issues Proposed changes

glance: allow configuring the rbd app name

Browse Source 
Instead of hardcoding it, let us override it with
values

Change-Id: Ifb8e5050d9fbcd7e5b40b2a5dcb4a2ce384ca195
This commit is contained in:
Itxaka 2019-05-28 13:08:35 +02:00
parent 11d76bb083
commit d1e5fb3f92
No known key found for this signature in database
GPG Key ID: 0FFB0E56C3539E24
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glance/templates/bin/_storage-init.sh.tpl
View File

@ -50,7 +50,7 @@ elif [ "x$STORAGE_BACKEND" == "xrbd" ]; then
ceph osd pool set "$1" size "${RBD_POOL_REPLICATION}" ceph osd pool set "$1" size "${RBD_POOL_REPLICATION}"
ceph osd pool set "$1" crush_rule "${RBD_POOL_CRUSH_RULE}" ceph osd pool set "$1" crush_rule "${RBD_POOL_CRUSH_RULE}"
} }
ensure_pool "${RBD_POOL_NAME}" "${RBD_POOL_CHUNK_SIZE}" "glance-image" ensure_pool "${RBD_POOL_NAME}" "${RBD_POOL_CHUNK_SIZE}" "${RBD_POOL_APP_NAME}"
if USERINFO=$(ceph auth get "client.${RBD_POOL_USER}"); then if USERINFO=$(ceph auth get "client.${RBD_POOL_USER}"); then
echo "Cephx user client.${RBD_POOL_USER} already exist." echo "Cephx user client.${RBD_POOL_USER} already exist."

2
glance/templates/job-storage-init.yaml
View File

@ -104,6 +104,8 @@ spec:
{{- if eq .Values.storage "rbd" }} {{- if eq .Values.storage "rbd" }}
- name: RBD_POOL_NAME - name: RBD_POOL_NAME
value: {{ .Values.conf.glance.glance_store.rbd_store_pool | quote }} value: {{ .Values.conf.glance.glance_store.rbd_store_pool | quote }}
- name: RBD_POOL_APP_NAME
value: {{ .Values.conf.software.rbd.rbd_store_pool_app_name | quote }}
- name: RBD_POOL_USER - name: RBD_POOL_USER
value: {{ .Values.conf.glance.glance_store.rbd_store_user | quote }} value: {{ .Values.conf.glance.glance_store.rbd_store_user | quote }}
- name: RBD_POOL_REPLICATION - name: RBD_POOL_REPLICATION

3
glance/values.yaml
View File

@ -121,6 +121,9 @@ network_policy:
- {} - {}
conf: conf:
software:
rbd:
rbd_store_pool_app_name: glance-image
rally_tests: rally_tests:
run_tempest: false run_tempest: false
tests: tests: