diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-08 13:54:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-08 13:54:36 +0000 |
| commit | 1d2e42e04a577bd3f5d56e0063103c54a57e1ec1 (patch) | |
| tree | e683342fd35edde0b6549cbd110d8745263cea0f /puppet | |
| parent | ff43f1d38ac2821b24ed81fc4b3537be7035f8a5 (diff) | |
| parent | bd695c56cf7b2c9dc4e106223589bf0843e6ae93 (diff) | |
Merge "Update cinder-api with new authtoken parameters"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/cinder-api.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml index 5e58dee9..fa2324b3 100644 --- a/puppet/services/cinder-api.yaml +++ b/puppet/services/cinder-api.yaml @@ -34,10 +34,10 @@ outputs: config_settings: map_merge: - get_attr: [CinderBase, role_data, config_settings] - - cinder::api::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} - cinder::api::identity_uri: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} - cinder::api::keystone_password: {get_param: CinderPassword} - cinder::api::keystone_tenant: 'service' + - cinder::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} + cinder::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} + cinder::keystone::authtoken::password: {get_param: CinderPassword} + cinder::keystone::authtoken::project_name: 'service' cinder::api::enable_proxy_headers_parsing: true cinder::api::nova_catalog_info: 'compute:Compute Service:internalURL' # TODO(emilien) move it to puppet-cinder |