aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-09 09:25:08 +0000
committerGerrit Code Review <review@openstack.org>2016-08-09 09:25:08 +0000
commit3f69e00ac2bf439bb8f276bd2733bcad1b7e7b4b (patch)
tree5f08145507eb51c9301e49d2411c97dec42ea663
parentf2486c3dd7360ffdb86d085509ebbc4f6a108a69 (diff)
parent219acaa5c256505420e9d838cd08c2130ebc191a (diff)
Merge "Move setting of Glance's keystone region to API profile"
-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 1e8eddc3..c2075e63 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -679,7 +679,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: