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-registry.yaml | |
parent | 712b712f5a8b165fb7f5b98613522e52ea06af4d (diff) | |
parent | 98c6bdaa9916b413069b73eea8a80fa96d2e4c39 (diff) |
Merge "Last round of modern authtoken update"
Diffstat (limited to 'puppet/services/glance-registry.yaml')
-rw-r--r-- | puppet/services/glance-registry.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/puppet/services/glance-registry.yaml b/puppet/services/glance-registry.yaml index 06ef9379..3377a572 100644 --- a/puppet/services/glance-registry.yaml +++ b/puppet/services/glance-registry.yaml @@ -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 |