Merge "Move setting of Glance's keystone region to API profile"
This commit is contained in:
commit
3f69e00ac2
|
@ -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}
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue