From b6939372920e4c425ed821a24cd998a529994e2f Mon Sep 17 00:00:00 2001
From: Derek Higgins <derekh@redhat.com>
Date: Mon, 11 Nov 2013 20:35:02 +0000
Subject: [PATCH] Use swift as a backend to glance

This commit will cause swift to be used as a backend to glance
if the heat metadata glance.backend = swift.

Change-Id: I4c4cc0c6763a91803ba51703a552a080d637abb0
---
 elements/glance/README.md                             | 11 +++++++++++
 .../os-config-applier/etc/glance/glance-api.conf      | 10 +++++-----
 .../os-config-applier/etc/glance/glance-cache.conf    |  8 ++++----
 elements/seed-stack-config/config.json                |  5 +----
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/elements/glance/README.md b/elements/glance/README.md
index f808598ca..b74d85cf0 100644
--- a/elements/glance/README.md
+++ b/elements/glance/README.md
@@ -1 +1,12 @@
 Installs glance service from git.
+
+Configuration
+-------------
+glance:
+    backend: swift
+      - The backend store to use
+    service-password: password
+      - The service password for the glance user
+    swift-store-user: service:glance
+    swift-store-key:  userpassword
+      - The credentials to use against swift if using the swift backend.
diff --git a/elements/glance/os-config-applier/etc/glance/glance-api.conf b/elements/glance/os-config-applier/etc/glance/glance-api.conf
index 3c003277c..1a5ebf0f5 100644
--- a/elements/glance/os-config-applier/etc/glance/glance-api.conf
+++ b/elements/glance/os-config-applier/etc/glance/glance-api.conf
@@ -7,7 +7,7 @@
 [DEFAULT]
 debug = False
 
-default_store = file
+default_store = {{glance.backend}}
 
 bind_host = 0.0.0.0
 bind_port = 9292
@@ -59,12 +59,12 @@ qpid_tcp_nodelay = True
 filesystem_store_datadir = /var/lib/glance/images/
 
 swift_store_auth_version = 2
-swift_store_auth_address = {{keystone.host}}:5000/v2.0/
+swift_store_auth_address = http://{{keystone.host}}:5000/v2.0/
 
-swift_store_user = {{swift.store_user}}
-swift_store_key = {{swift.store_key}}
+swift_store_user = {{glance.swift-store-user}}
+swift_store_key = {{glance.swift-store-key}}
 swift_store_container = glance
-swift_store_create_container_on_put = False
+swift_store_create_container_on_put = True
 swift_store_large_object_size = 5120
 swift_store_large_object_chunk_size = 200
 swift_enable_snet = False
diff --git a/elements/glance/os-config-applier/etc/glance/glance-cache.conf b/elements/glance/os-config-applier/etc/glance/glance-cache.conf
index 0c5290319..0c5560716 100644
--- a/elements/glance/os-config-applier/etc/glance/glance-cache.conf
+++ b/elements/glance/os-config-applier/etc/glance/glance-cache.conf
@@ -16,11 +16,11 @@ registry_port = 9191
 
 filesystem_store_datadir = /var/lib/glance/images/
 swift_store_auth_version = 2
-swift_store_auth_address = 127.0.0.1:5000/v2.0/
-swift_store_user = jdoe:jdoe
-swift_store_key = a86850deb2742ec3cb41518e26aa2d89
+swift_store_auth_address = http://{{keystone.host}}:5000/v2.0/
+swift_store_user = {{glance.swift-store-user}}
+swift_store_key = {{glance.swift-store-key}}
 swift_store_container = glance
-swift_store_create_container_on_put = False
+swift_store_create_container_on_put = True
 swift_store_large_object_size = 5120
 swift_store_large_object_chunk_size = 200
 swift_enable_snet = False
diff --git a/elements/seed-stack-config/config.json b/elements/seed-stack-config/config.json
index ad0a5d920..2cf6c2de9 100644
--- a/elements/seed-stack-config/config.json
+++ b/elements/seed-stack-config/config.json
@@ -14,6 +14,7 @@
     "password": "guest"
   },
   "glance": {
+    "backend": "file",
     "host": "127.0.0.1",
     "db": "mysql://glance:unset@localhost/glance",
     "service-password": "unset"
@@ -79,9 +80,5 @@
   },
   "horizon": {
     "secret_key": "unset___________"
-  },
-  "swift": {
-    "store_user": "unset",
-    "store_key": "unset"
   }
 }