From a6831e945f8fe6bee2281ab18c1af3d57dff3167 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Fri, 7 Jul 2017 16:56:10 +0800 Subject: [PATCH] Support cinder backend for glance Change-Id: I32de4c37f531a3d22bf80e1eca6635631e489842 Closes-Bug: #1702842 --- ansible/roles/cinder/templates/cinder.conf.j2 | 1 + ansible/roles/glance/defaults/main.yml | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2 index 44803fc4d0..b59028c5d6 100644 --- a/ansible/roles/cinder/templates/cinder.conf.j2 +++ b/ansible/roles/cinder/templates/cinder.conf.j2 @@ -118,6 +118,7 @@ rados_connect_timeout = 5 rbd_user = cinder rbd_secret_uuid = {{ cinder_rbd_secret_uuid }} report_discard_supported = True +image_upload_use_cinder_backend = True {% endif %} {% if enable_cinder_backend_nfs | bool %} diff --git a/ansible/roles/glance/defaults/main.yml b/ansible/roles/glance/defaults/main.yml index 9203eb89fd..562811d532 100644 --- a/ansible/roles/glance/defaults/main.yml +++ b/ansible/roles/glance/defaults/main.yml @@ -62,10 +62,16 @@ glance_api_image_full: "{{ glance_api_image }}:{{ glance_api_tag }}" # Glance #################### glance_backends: - - name: "rbd,http" + - name: file + enabled: true + - name: http + enabled: true + - name: "rbd" enabled: "{{ enable_ceph | bool and glance_backend_ceph | bool }}" - name: "vmware" enabled: "{{ glance_backend_vmware | bool }}" + - name: cinder + enabled: "{{ enable_cinder | bool }}" glance_store_backends: "{{ glance_backends|selectattr('enabled', 'equalto', true)|list }}"