From c41ad61484812c9395630416c44e1345716f7c81 Mon Sep 17 00:00:00 2001
From: Florian Haas <florian@hastexo.com>
Date: Tue, 9 Jul 2013 09:52:14 +0000
Subject: [PATCH] Fix Keystone configuration for Glance API

---
 manifests/glance/api.pp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/manifests/glance/api.pp b/manifests/glance/api.pp
index 6704a4a..75a60dc 100644
--- a/manifests/glance/api.pp
+++ b/manifests/glance/api.pp
@@ -2,8 +2,7 @@ class kickstack::glance::api inherits kickstack {
 
   include kickstack::glance::config
 
-  # Grab the Keystone admin token from a kickstack fact and configure
-  # Keystone accordingly. If no fact has been set, generate a password.
+  $auth_host = getvar("${fact_prefix}keystone_internal_address")
   $service_password = getvar("${fact_prefix}glance_keystone_password")
   $sql_conn = getvar("${fact_prefix}glance_sql_connection")
   $reg_host = getvar("${fact_prefix}glance_registry_host")
@@ -11,6 +10,8 @@ class kickstack::glance::api inherits kickstack {
   class { '::glance::api':
     verbose           => $kickstack::verbose,
     debug             => $kickstack::debug,
+    auth_type         => 'keystone',
+    auth_host         => $auth_host,
     keystone_tenant   => $kickstack::keystone_service_tenant,
     keystone_user     => 'glance',
     keystone_password => $service_password,