diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-08-05 09:50:30 -0400 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2016-08-05 18:51:10 -0400 |
| commit | bd695c56cf7b2c9dc4e106223589bf0843e6ae93 (patch) | |
| tree | d2aff9787a71b3280e230ab0a31bc7fe5138cd69 | |
| parent | 73656aac0dbf1e0bbc8ee10cf5f282c93af4174b (diff) | |
Update cinder-api with new authtoken parameters
Puppet OpenStack modules are moving to a new class to configure Keystone
authtoken parameters, so we can more easily enable Keystone v3 from a
single interface. It's consistent across all modules and does support
both Keystone v2 and v3 parameters.
This patch updates Cinder now, but more will follow when we'll add
support to all modules.
Change-Id: I5aa3f2b03672c14c0dbeac222f421ab94221ecf7
| -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 |