From 6d6b1348eadd024d060943fa1ad908082c1a8aef Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 28 Feb 2022 23:01:53 +0900 Subject: [PATCH] Remove tenant_id templating from endpoint URLs ... because it is no longer required. Depends-on: https://review.opendev.org/822040 Change-Id: If332b4c512e55a66e2bb29bb6375890375075b9e --- manifests/keystone/auth.pp | 18 +++++++++--------- ..._id-from-endpoint-url-c1034329f9698936.yaml | 6 ++++++ spec/classes/cinder_keystone_auth_spec.rb | 6 +++--- 3 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 releasenotes/notes/remove-tenant_id-from-endpoint-url-c1034329f9698936.yaml diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index d6d1d18f..8d933ff6 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -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, diff --git a/releasenotes/notes/remove-tenant_id-from-endpoint-url-c1034329f9698936.yaml b/releasenotes/notes/remove-tenant_id-from-endpoint-url-c1034329f9698936.yaml new file mode 100644 index 00000000..0eafe609 --- /dev/null +++ b/releasenotes/notes/remove-tenant_id-from-endpoint-url-c1034329f9698936.yaml @@ -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. diff --git a/spec/classes/cinder_keystone_auth_spec.rb b/spec/classes/cinder_keystone_auth_spec.rb index b578a553..48c7a823 100644 --- a/spec/classes/cinder_keystone_auth_spec.rb +++ b/spec/classes/cinder_keystone_auth_spec.rb @@ -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