openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Fix tempest volume tests on queens 

With [1], keystone catalog entries are no longer created for cinder's
v1 API. This works fine with the latest version of tempest, but older
versions of tempest assume a service named "volume" is present in the
catalog. This patch ensures the service exists, but reuses the endpoints
from cinder's v3 API.

[1] https://review.openstack.org/644550

Closes-Bug: #1822080
Change-Id: If1ef8b1ad60151c0dfd0a7804ba7e697fc4ede28
This commit is contained in:
Alan Bishop 2019-04-01 11:51:29 -04:00 committed by Quique Llorente
parent 4fec5c8b97
commit 3bc041b47d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
puppet/services/cinder-api.yaml
View File

@ -164,10 +164,14 @@ outputs:
- {get_param: CinderApiLoggingSource}
keystone:
cinder::keystone::auth::tenant: 'service'
cinder::keystone::auth::configure_endpoint: false
# Create the "volume" service using the same catalog info as the
# "volumev3" service (see LP#1822080).
cinder::keystone::auth::service_name: cinderv3
cinder::keystone::auth::service_type: volumev3
cinder::keystone::auth::service_type: volume
cinder::keystone::auth::service_description: 'Cinder Service v3'
cinder::keystone::auth::public_url: {get_param: [EndpointMap, CinderV3Public, uri]}
cinder::keystone::auth::internal_url: {get_param: [EndpointMap, CinderV3Internal, uri]}
cinder::keystone::auth::admin_url: {get_param: [EndpointMap, CinderV3Admin, uri]}
cinder::keystone::auth::public_url_v2: {get_param: [EndpointMap, CinderV2Public, uri]}
cinder::keystone::auth::internal_url_v2: {get_param: [EndpointMap, CinderV2Internal, uri]}
cinder::keystone::auth::admin_url_v2: {get_param: [EndpointMap, CinderV2Admin, uri]}