diff --git a/glance/templates/bin/_storage-init.sh.tpl b/glance/templates/bin/_storage-init.sh.tpl index 5a9572faf0..5a9c25f398 100644 --- a/glance/templates/bin/_storage-init.sh.tpl +++ b/glance/templates/bin/_storage-init.sh.tpl @@ -50,7 +50,7 @@ elif [ "x$STORAGE_BACKEND" == "xrbd" ]; then ceph osd pool set "$1" size "${RBD_POOL_REPLICATION}" 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 echo "Cephx user client.${RBD_POOL_USER} already exist." diff --git a/glance/templates/job-storage-init.yaml b/glance/templates/job-storage-init.yaml index fd11cc11c3..6425b8f999 100644 --- a/glance/templates/job-storage-init.yaml +++ b/glance/templates/job-storage-init.yaml @@ -104,6 +104,8 @@ spec: {{- if eq .Values.storage "rbd" }} - name: RBD_POOL_NAME 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 value: {{ .Values.conf.glance.glance_store.rbd_store_user | quote }} - name: RBD_POOL_REPLICATION diff --git a/glance/values.yaml b/glance/values.yaml index 09ae97ad59..2f2496bbe9 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -121,6 +121,9 @@ network_policy: - {} conf: + software: + rbd: + rbd_store_pool_app_name: glance-image rally_tests: run_tempest: false tests: