From b400a4eb6b4d46f50068edec53978d738ae202ab Mon Sep 17 00:00:00 2001
From: Matt Thompson <mattt@defunct.ca>
Date: Tue, 9 Dec 2014 15:23:26 +0000
Subject: [PATCH] Move glance store options to [glance_store] section

Juno moves the store options under a new section called [glance_store],
this change updates glance-api.conf to reflect that.

Change-Id: Ie4b2484fd48f81add75781616945e1d13b765eaa
Closes-Bug: #1399423
---
 .../glance_common/templates/glance-api.conf   | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/rpc_deployment/roles/glance_common/templates/glance-api.conf b/rpc_deployment/roles/glance_common/templates/glance-api.conf
index 04174c6728..ab4f77a036 100644
--- a/rpc_deployment/roles/glance_common/templates/glance-api.conf
+++ b/rpc_deployment/roles/glance_common/templates/glance-api.conf
@@ -3,11 +3,6 @@ verbose = {{ verbose }}
 debug = {{ debug }}
 log_file = /var/log/glance/glance-api.log
 use_syslog = False
-default_store = {{ default_store }}
-known_stores = glance.store.filesystem.Store,
-               glance.store.http.Store,
-               glance.store.cinder.Store,
-               glance.store.swift.Store
 bind_host = 0.0.0.0
 bind_port = 9292
 backlog = 4096
@@ -33,27 +28,11 @@ rabbit_durable_queues = False
 {% endif %}
 
 
-filesystem_store_datadir = /var/lib/glance/images/
 delayed_delete = False
 scrub_time = 43200
 scrubber_datadir = /var/lib/glance/scrubber/
 image_cache_dir = /var/lib/glance/cache/
 
-{% if default_store == "swift" %}
-##### STORE OPTIONS #####
-swift_store_auth_version = 2
-swift_store_auth_address = {{ swift_store_auth_address }}
-swift_store_user = {{ swift_store_user }}
-swift_store_key = {{ swift_store_key }}
-swift_store_region = {{ swift_store_region }}
-swift_store_container = {{ swift_store_container }}
-swift_store_create_container_on_put = True
-swift_store_large_object_size = 5120
-swift_store_large_object_chunk_size = 200
-swift_store_retry_get_count = 5
-swift_store_endpoint_type = {{ swift_store_endpoint_type }}
-{% endif %}
-
 [database]
 connection = mysql://{{ container_mysql_user }}:{{ container_mysql_password }}@{{ mysql_address }}/{{ container_database }}?charset=utf8
 
@@ -79,3 +58,25 @@ check_revocations_for_cached = {{ hostvars[groups['keystone_all'][0]]['keystone_
 
 [paste_deploy]
 flavor = {{ flavor }}
+
+[glance_store]
+default_store = {{ default_store }}
+stores = glance.store.filesystem.Store,
+         glance.store.http.Store,
+         glance.store.cinder.Store,
+         glance.store.swift.Store
+{% if default_store == "file" %}
+filesystem_store_datadir = /var/lib/glance/images/
+{% elif default_store == "swift" %}
+swift_store_auth_version = 2
+swift_store_auth_address = {{ swift_store_auth_address }}
+swift_store_user = {{ swift_store_user }}
+swift_store_key = {{ swift_store_key }}
+swift_store_region = {{ swift_store_region }}
+swift_store_container = {{ swift_store_container }}
+swift_store_create_container_on_put = True
+swift_store_large_object_size = 5120
+swift_store_large_object_chunk_size = 200
+swift_store_retry_get_count = 5
+swift_store_endpoint_type = {{ swift_store_endpoint_type }}
+{% endif %}