diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-01 01:42:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-01 01:42:15 +0000 |
| commit | 9fb264b138eb3422e9f649a225b8b694b8f86dc1 (patch) | |
| tree | 20ca6d79539ec26c5afe6db4c60373d5fa8cb412 /puppet/services/glance-api.yaml | |
| parent | 712b712f5a8b165fb7f5b98613522e52ea06af4d (diff) | |
| parent | 98c6bdaa9916b413069b73eea8a80fa96d2e4c39 (diff) | |
Merge "Last round of modern authtoken update"
Diffstat (limited to 'puppet/services/glance-api.yaml')
| -rw-r--r-- | puppet/services/glance-api.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml index d2376af3..94f9b9a7 100644 --- a/puppet/services/glance-api.yaml +++ b/puppet/services/glance-api.yaml @@ -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 |