Merge "Fix glance configuration when using external ceph"

This commit is contained in:
Zuul 2018-12-06 09:51:19 +00:00 committed by Gerrit Code Review
commit d7a905eb9e
2 changed files with 2 additions and 2 deletions

View File

@ -112,7 +112,7 @@ glance_backends:
- name: http - name: http
enabled: true enabled: true
- name: "rbd" - name: "rbd"
enabled: "{{ enable_ceph | bool and glance_backend_ceph | bool }}" enabled: "{{ glance_backend_ceph | bool }}"
- name: "vmware" - name: "vmware"
enabled: "{{ glance_backend_vmware | bool }}" enabled: "{{ glance_backend_vmware | bool }}"
- name: cinder - name: cinder

View File

@ -61,7 +61,7 @@ filesystem_store_datadir = /var/lib/glance/images/
stores = {{ glance_store_backends|map(attribute='name')|join(',') }} stores = {{ glance_store_backends|map(attribute='name')|join(',') }}
{% endif %} {% endif %}
{% if enable_ceph | bool and glance_backend_ceph | bool %} {% if glance_backend_ceph | bool %}
rbd_store_user = glance rbd_store_user = glance
rbd_store_pool = {{ ceph_glance_pool_name }} rbd_store_pool = {{ ceph_glance_pool_name }}
rbd_store_chunk_size = 8 rbd_store_chunk_size = 8