Last round of modern authtoken update
It updates Glance, Neutron and Swift to deploy authtoken with modern pattern. Change-Id: Icfaf011ea4a23bc47d2fb45e8768f8238532dab3
This commit is contained in:
parent
e774cb35d5
commit
98c6bdaa99
|
@ -90,14 +90,14 @@ outputs:
|
|||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||
- '/glance'
|
||||
glance::api::bind_port: {get_param: [EndpointMap, GlanceInternal, port]}
|
||||
glance::api::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
||||
glance::api::identity_uri: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
|
||||
glance::api::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
||||
glance::api::authtoken::auth_url: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
|
||||
glance::api::registry_host:
|
||||
str_replace:
|
||||
template: "'REGISTRY_HOST'"
|
||||
params:
|
||||
REGISTRY_HOST: {get_param: [EndpointMap, GlanceRegistryInternal, host]}
|
||||
glance::api::keystone_password: {get_param: GlancePassword}
|
||||
glance::api::authtoken::password: {get_param: GlancePassword}
|
||||
glance::api::enable_proxy_headers_parsing: true
|
||||
glance::api::debug: {get_param: Debug}
|
||||
glance::api::workers: {get_param: GlanceWorkers}
|
||||
|
@ -128,7 +128,7 @@ outputs:
|
|||
- 9292
|
||||
- 13292
|
||||
glance::keystone::auth::tenant: 'service'
|
||||
glance::api::keystone_tenant: 'service'
|
||||
glance::api::authtoken::project_name: 'service'
|
||||
glance::api::pipeline: 'keystone'
|
||||
glance::api::show_image_direct_url: true
|
||||
# NOTE: bind IP is found in Heat replacing the network name with the
|
||||
|
|
|
@ -46,11 +46,11 @@ outputs:
|
|||
- '@'
|
||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||
- '/glance'
|
||||
glance::registry::keystone_password: {get_param: GlancePassword}
|
||||
glance::registry::keystone_tenant: 'service'
|
||||
glance::registry::authtoken::password: {get_param: GlancePassword}
|
||||
glance::registry::authtoken::project_name: 'service'
|
||||
glance::registry::pipeline: 'keystone'
|
||||
glance::registry::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
||||
glance::registry::identity_uri: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
|
||||
glance::registry::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
||||
glance::registry::authtoken::auth_url: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
|
||||
glance::registry::debug: {get_param: Debug}
|
||||
glance::registry::workers: {get_param: GlanceWorkers}
|
||||
glance::db::mysql::user: glance
|
||||
|
|
|
@ -79,19 +79,19 @@ outputs:
|
|||
neutron::keystone::auth::admin_url: { get_param: [ EndpointMap, NeutronAdmin, uri ] }
|
||||
neutron::keystone::auth::password: {get_param: NeutronPassword}
|
||||
neutron::keystone::auth::region: {get_param: KeystoneRegion}
|
||||
neutron::server::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
||||
neutron::server::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
||||
neutron::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
||||
neutron::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
||||
neutron::server::api_workers: {get_param: NeutronWorkers}
|
||||
neutron::server::allow_automatic_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
|
||||
neutron::server::l3_ha: {get_param: NeutronL3HA}
|
||||
neutron::server::password: {get_param: NeutronPassword}
|
||||
neutron::keystone::authtoken::password: {get_param: NeutronPassword}
|
||||
|
||||
neutron::server::notifications::nova_url: { get_param: [ EndpointMap, NovaInternal, uri ] }
|
||||
neutron::server::notifications::auth_url: { get_param: [ EndpointMap, KeystoneV3Admin, uri ] }
|
||||
neutron::server::notifications::tenant_name: 'service'
|
||||
neutron::server::notifications::project_name: 'service'
|
||||
neutron::server::notifications::password: {get_param: NovaPassword}
|
||||
neutron::server::project_name: 'service'
|
||||
neutron::keystone::authtoken::project_name: 'service'
|
||||
neutron::server::sync_db: true
|
||||
neutron::db::mysql::password: {get_param: NeutronPassword}
|
||||
neutron::db::mysql::user: neutron
|
||||
|
|
|
@ -57,9 +57,9 @@ outputs:
|
|||
- get_attr: [SwiftBase, role_data, config_settings]
|
||||
|
||||
- swift::proxy::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
|
||||
swift::proxy::authtoken::identity_uri: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
||||
swift::proxy::authtoken::admin_password: {get_param: SwiftPassword}
|
||||
swift::proxy::authtoken::admin_tenant_name: 'service'
|
||||
swift::proxy::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
||||
swift::proxy::authtoken::password: {get_param: SwiftPassword}
|
||||
swift::proxy::authtoken::project_name: 'service'
|
||||
swift::proxy::node_timeout: {get_param: SwiftProxyNodeTimeout}
|
||||
swift::proxy::workers: {get_param: SwiftWorkers}
|
||||
swift::keystone::auth::public_url: {get_param: [EndpointMap, SwiftPublic, uri]}
|
||||
|
|
Loading…
Reference in New Issue