diff --git a/ansible/roles/glance/defaults/main.yml b/ansible/roles/glance/defaults/main.yml index c181e36366..7f1f9672fb 100644 --- a/ansible/roles/glance/defaults/main.yml +++ b/ansible/roles/glance/defaults/main.yml @@ -112,7 +112,7 @@ glance_backends: - name: http enabled: true - name: "rbd" - enabled: "{{ enable_ceph | bool and glance_backend_ceph | bool }}" + enabled: "{{ glance_backend_ceph | bool }}" - name: "vmware" enabled: "{{ glance_backend_vmware | bool }}" - name: cinder diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2 index ec5cd0fb97..859ac79dfc 100644 --- a/ansible/roles/glance/templates/glance-api.conf.j2 +++ b/ansible/roles/glance/templates/glance-api.conf.j2 @@ -61,7 +61,7 @@ filesystem_store_datadir = /var/lib/glance/images/ stores = {{ glance_store_backends|map(attribute='name')|join(',') }} {% endif %} -{% if enable_ceph | bool and glance_backend_ceph | bool %} +{% if glance_backend_ceph | bool %} rbd_store_user = glance rbd_store_pool = {{ ceph_glance_pool_name }} rbd_store_chunk_size = 8