From 70643a5237c11311fdd4381076a067179710e8c0 Mon Sep 17 00:00:00 2001
From: Chris Hoge <chris@openstack.org>
Date: Tue, 18 Oct 2016 21:44:30 -0700
Subject: [PATCH] Add http as allowed store when glance configured to use rbd

Adds http as an allowed store when glance is configured to use
ceph/rbd as the image store. The default configuration for
glance with lvm uses http as a secondary store. http store
is commonly used with automation tools like heat to pull
images into glance from endpoints. Without specifying http
as a store the expected default behavior fails. This patch
restores that default behavior.

Change-Id: Id3663123b8d54e53bd1fd130b65fd8383c9f35c0
Closes-Bug: #1631637
---
 ansible/roles/glance/templates/glance-api.conf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2
index fd01f2b197..9d53735948 100644
--- a/ansible/roles/glance/templates/glance-api.conf.j2
+++ b/ansible/roles/glance/templates/glance-api.conf.j2
@@ -61,7 +61,7 @@ flavor = keystone
 [glance_store]
 {% if enable_ceph | bool and glance_backend_ceph | bool %}
 default_store = rbd
-stores = rbd
+stores = rbd,http
 rbd_store_user = glance
 rbd_store_pool = {{ ceph_glance_pool_name }}
 rbd_store_chunk_size = 8