summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-08-08 13:34:15 +0300
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-08-08 16:58:06 +0300
commit219acaa5c256505420e9d838cd08c2130ebc191a (patch)
tree577ab6df267ae04d18091cbf9b6e9af3cf33bc35
parentc892df40b520e2ea442ac9c25ee1b2800beb5ee8 (diff)
Move setting of Glance's keystone region to API profile
This is not necessary in the controller.yaml and is more appropriate in the profile. Change-Id: Ie2badbd87eabb8404acff77e9aa5d091fbdd1499
-rw-r--r--puppet/controller.yaml1
-rw-r--r--puppet/services/glance-api.yaml5
2 files changed, 5 insertions, 1 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index f6410146..12af7d3d 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -678,7 +678,6 @@ resources:
# Glance
glance::api::bind_host: {get_input: glance_api_network}
glance::registry::bind_host: {get_input: glance_registry_network}
- glance::keystone::auth::region: {get_input: keystone_region}
# Heat
heat::api::bind_host: {get_input: heat_api_network}
diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml
index 99065789..bb14546f 100644
--- a/puppet/services/glance-api.yaml
+++ b/puppet/services/glance-api.yaml
@@ -60,6 +60,10 @@ parameters:
Rabbit client subscriber parameter to specify
an SSL connection to the RabbitMQ host.
type: string
+ KeystoneRegion:
+ type: string
+ default: 'regionOne'
+ description: Keystone region for endpoint
outputs:
role_data:
@@ -106,6 +110,7 @@ outputs:
glance::keystone::auth::internal_url: {get_param: [EndpointMap, GlanceInternal, uri]}
glance::keystone::auth::admin_url: {get_param: [EndpointMap, GlanceAdmin, uri]}
glance::keystone::auth::password: {get_param: GlancePassword }
+ glance::keystone::auth::region: {get_param: KeystoneRegion}
glance::registry::db::database_db_max_retries: -1
glance::registry::db::database_max_retries: -1
tripleo.glance_api.firewall_rules: