From: Emilien Macchi <emilien@redhat.com>
Date: Fri, 5 Aug 2016 13:50:30 +0000 (-0400)
Subject: Update cinder-api with new authtoken parameters
X-Git-Tag: opnfv-6.0.0~1789^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=bd695c56cf7b2c9dc4e106223589bf0843e6ae93;p=apex-tripleo-heat-templates.git

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
---

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