openstack/kolla-ansible
Code Issues Proposed changes

Merge "Support cinder backend for glance"

Browse Source
This commit is contained in:
Jenkins 2017-07-18 15:41:23 +00:00 committed by Gerrit Code Review
commit 4d38340623
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/cinder/templates/cinder.conf.j2
View File

@ -118,6 +118,7 @@ rados_connect_timeout = 5
rbd_user = cinder rbd_user = cinder
rbd_secret_uuid = {{ cinder_rbd_secret_uuid }} rbd_secret_uuid = {{ cinder_rbd_secret_uuid }}
report_discard_supported = True report_discard_supported = True
image_upload_use_cinder_backend = True
{% endif %} {% endif %}
{% if enable_cinder_backend_nfs | bool %} {% if enable_cinder_backend_nfs | bool %}

8
ansible/roles/glance/defaults/main.yml
View File

@ -62,10 +62,16 @@ glance_api_image_full: "{{ glance_api_image }}:{{ glance_api_tag }}"
# Glance # Glance
#################### ####################
glance_backends: glance_backends:
- name: "rbd,http" - name: file
enabled: true
- name: http
enabled: true
- name: "rbd"
enabled: "{{ enable_ceph | bool and glance_backend_ceph | bool }}" enabled: "{{ enable_ceph | bool and glance_backend_ceph | bool }}"
- name: "vmware" - name: "vmware"
enabled: "{{ glance_backend_vmware | bool }}" enabled: "{{ glance_backend_vmware | bool }}"
- name: cinder
enabled: "{{ enable_cinder | bool }}"
glance_store_backends: "{{ glance_backends|selectattr('enabled', 'equalto', true)|list }}" glance_store_backends: "{{ glance_backends|selectattr('enabled', 'equalto', true)|list }}"