openstack/puppet-cinder
Code Issues Proposed changes

Remove tenant_id templating from endpoint URLs

Browse Source 
... because it is no longer required.

Depends-on: https://review.opendev.org/822040
Change-Id: If332b4c512e55a66e2bb29bb6375890375075b9e
This commit is contained in:
Takashi Kajinami 2022-02-28 23:01:53 +09:00
parent a00a1da9fa
commit 6d6b1348ea
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/keystone/auth.pp
View File

@ -98,24 +98,24 @@
# [*public_url_v3*]
# (0ptional) The v3 endpoint's public url.
# This url should *not* contain any trailing '/'.
# Defaults to 'http://127.0.0.1:8776/v3/%(tenant_id)s'
# Defaults to 'http://127.0.0.1:8776/v3'
#
# [*internal_url_v3*]
# (Optional) The v3 endpoint's internal url.
# This url should *not* contain any trailing '/'.
# Defaults to 'http://127.0.0.1:8776/v3/%(tenant_id)s'
# Defaults to 'http://127.0.0.1:8776/v3'
#
# [*admin_url_v3*]
# (Optional) The v3 endpoint's admin url.
# This url should *not* contain any trailing '/'.
# Defaults to 'http://127.0.0.1:8776/v3/%(tenant_id)s'
# Defaults to 'http://127.0.0.1:8776/v3'
#
# === Examples
#
# class { 'cinder::keystone::auth':
# public_url => 'https://10.0.0.10:8776/v3/%(tenant_id)s',
# internal_url => 'https://10.0.0.20:8776/v3/%(tenant_id)s',
# admin_url => 'https://10.0.0.30:8776/v3/%(tenant_id)s',
# public_url => 'https://10.0.0.10:8776/v3',
# internal_url => 'https://10.0.0.20:8776/v3',
# admin_url => 'https://10.0.0.30:8776/v3',
# }
#
class cinder::keystone::auth (
@ -133,9 +133,9 @@ class cinder::keystone::auth (
$system_roles_v3 = [],
$email = 'cinder@localhost',
$email_user_v3 = 'cinderv3@localhost',
$public_url_v3 = 'http://127.0.0.1:8776/v3/%(tenant_id)s',
$internal_url_v3 = 'http://127.0.0.1:8776/v3/%(tenant_id)s',
$admin_url_v3 = 'http://127.0.0.1:8776/v3/%(tenant_id)s',
$public_url_v3 = 'http://127.0.0.1:8776/v3',
$internal_url_v3 = 'http://127.0.0.1:8776/v3',
$admin_url_v3 = 'http://127.0.0.1:8776/v3',
$configure_endpoint_v3 = true,
$configure_user = true,
$configure_user_v3 = false,

6
releasenotes/notes/remove-tenant_id-from-endpoint-url-c1034329f9698936.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Default values of the ``cinder::keystone::auth::*_url_v3`` parameters have
been updated and now these no longer include the ``%(tenant_id)s``
template.

6
spec/classes/cinder_keystone_auth_spec.rb
View File

@ -40,9 +40,9 @@ describe 'cinder::keystone::auth' do
:roles => ['admin'],
:system_scope => 'all',
:system_roles => [],
:public_url => 'http://127.0.0.1:8776/v3/%(tenant_id)s',
:internal_url => 'http://127.0.0.1:8776/v3/%(tenant_id)s',
:admin_url => 'http://127.0.0.1:8776/v3/%(tenant_id)s',
:public_url => 'http://127.0.0.1:8776/v3',
:internal_url => 'http://127.0.0.1:8776/v3',
:admin_url => 'http://127.0.0.1:8776/v3',
) }
end