From 9fcb12cb7e207ac47b8902d8160799747bc36346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr@redhat.com>
Date: Mon, 5 Jan 2015 13:20:07 +0100
Subject: [PATCH] Fixed Cirros image provisioning

Added missing region option for files glance-api.conf and glance-cache.conf.

Change-Id: I1fb6deccbf12138e698e6e44775f4603f1bb12ff
Closes-bug: #1406039
(cherry picked from commit 8b8082f086f5eb6a2151c4ae264cd609e1835d6c)
---
 packstack/plugins/keystone_100.py                   | 2 +-
 packstack/puppet/templates/glance.pp                | 2 +-
 packstack/puppet/templates/provision_demo_glance.pp | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packstack/plugins/keystone_100.py b/packstack/plugins/keystone_100.py
index 3dd9daec4..adf4e0854 100644
--- a/packstack/plugins/keystone_100.py
+++ b/packstack/plugins/keystone_100.py
@@ -58,7 +58,7 @@ def initConfig(controller):
              "MASK_INPUT": False,
              "LOOSE_VALIDATION": False,
              "CONF_NAME": "CONFIG_KEYSTONE_REGION",
-             "USE_DEFAULT": True,
+             "USE_DEFAULT": False,
              "NEED_CONFIRM": False,
              "CONDITION": False},
 
diff --git a/packstack/puppet/templates/glance.pp b/packstack/puppet/templates/glance.pp
index 9d7aaad62..e1090d161 100644
--- a/packstack/puppet/templates/glance.pp
+++ b/packstack/puppet/templates/glance.pp
@@ -10,6 +10,7 @@ class { 'glance::api':
   database_connection => "mysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance",
   verbose             => true,
   debug               => hiera('CONFIG_DEBUG_MODE'),
+  os_region_name      => hiera('CONFIG_KEYSTONE_REGION')
 }
 
 class { 'glance::registry':
@@ -21,4 +22,3 @@ class { 'glance::registry':
   verbose             => true,
   debug               => hiera('CONFIG_DEBUG_MODE'),
 }
-
diff --git a/packstack/puppet/templates/provision_demo_glance.pp b/packstack/puppet/templates/provision_demo_glance.pp
index 062d0a2af..e9f7fe583 100644
--- a/packstack/puppet/templates/provision_demo_glance.pp
+++ b/packstack/puppet/templates/provision_demo_glance.pp
@@ -12,4 +12,3 @@
     disk_format      => 'qcow2',
     source           => $image_source,
   }
-