openstack/puppet-manila
Code Issues Proposed changes

Drop tenant_id templating from v2 endpoint

Browse Source 
Manila's wallaby release [1] made it possible for
the v2 endpoint to not include a tenant_id
(project_id). This change was made to
accommodate interactions by system scoped users.

System scoped users cannot interact with an
endpoint that needs the "tenant_id" templating,
because system scoped tokens cannot be resolved
to a particular tenant_id by definition. More
information regarding this change is captured
in the release notes for the project [2] and
the API reference [3].

[1] https://review.opendev.org/c/openstack/manila/+/773709
[2] https://docs.openstack.org/releasenotes/manila/wallaby.html#prelude
[3] https://docs.openstack.org/api-ref/shared-file-system/#shared-file-systems-api

Change-Id: I77c81b79539ccedb7dbac3e30f6eb257b5f6e082
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
This commit is contained in:
Goutham Pacha Ravi 2021-07-27 22:55:52 -07:00
parent f2535f2aa6
commit e790080e38
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/keystone/auth.pp
View File

@ -86,17 +86,17 @@
# [*public_url_v2*]
# (Optional) The v2 endpoint's public url.
# This url should *not* contain any trailing '/'.
# Defaults to 'http://127.0.0.1:8786/v2/%(tenant_id)s'
# Defaults to 'http://127.0.0.1:8786/v2'
#
# [*admin_url_v2*]
# (Optional) The endpoint's admin url.
# This url should *not* contain any trailing '/'.
# Defaults to 'http://127.0.0.1:8786/v2/%(tenant_id)s'
# Defaults to 'http://127.0.0.1:8786/v2'
#
# [*internal_url_v2*]
# (Optional) The endpoint's internal url.
# This url should *not* contain any trailing '/'.
# Defaults to 'http://127.0.0.1:8786/v2/%(tenant_id)s'
# Defaults to 'http://127.0.0.1:8786/v2'
#
# === Examples
#
@ -124,11 +124,11 @@ class manila::keystone::auth (
$service_description_v2 = 'Manila Service v2',
$region = 'RegionOne',
$public_url = 'http://127.0.0.1:8786/v1/%(tenant_id)s',
$public_url_v2 = 'http://127.0.0.1:8786/v2/%(tenant_id)s',
$public_url_v2 = 'http://127.0.0.1:8786/v2',
$admin_url = 'http://127.0.0.1:8786/v1/%(tenant_id)s',
$admin_url_v2 = 'http://127.0.0.1:8786/v2/%(tenant_id)s',
$admin_url_v2 = 'http://127.0.0.1:8786/v2',
$internal_url = 'http://127.0.0.1:8786/v1/%(tenant_id)s',
$internal_url_v2 = 'http://127.0.0.1:8786/v2/%(tenant_id)s',
$internal_url_v2 = 'http://127.0.0.1:8786/v2',
) {
include manila::deps

7
releasenotes/notes/drop-project-id-endpoint-1711aaf3e3853e02.yaml Normal file
View File

@ -0,0 +1,7 @@
---
upgrade:
- |
The default "v2" endpoints for the manila API service no longer contain
a "tenant_id" template. Support for such endpoints was added
in the manila service during the Wallaby release to accommodate
system-scoped API requests.

18
spec/classes/manila_keystone_auth_spec.rb
View File

@ -49,9 +49,9 @@ describe 'manila::keystone::auth' do
) }
it { is_expected.to contain_keystone_endpoint('RegionOne/manilav2::sharev2').with(
:ensure => 'present',
:public_url => 'http://127.0.0.1:8786/v2/%(tenant_id)s',
:admin_url => 'http://127.0.0.1:8786/v2/%(tenant_id)s',
:internal_url => 'http://127.0.0.1:8786/v2/%(tenant_id)s'
:public_url => 'http://127.0.0.1:8786/v2',
:admin_url => 'http://127.0.0.1:8786/v2',
:internal_url => 'http://127.0.0.1:8786/v2'
) }
end
@ -63,9 +63,9 @@ describe 'manila::keystone::auth' do
:public_url => 'https://10.0.42.1:4242/v42/%(tenant_id)s',
:admin_url => 'https://10.0.42.2:4242/v42/%(tenant_id)s',
:internal_url => 'https://10.0.42.3:4242/v42/%(tenant_id)s',
:public_url_v2 => 'https://10.0.42.1:4242/v43/%(tenant_id)s',
:admin_url_v2 => 'https://10.0.42.2:4242/v43/%(tenant_id)s',
:internal_url_v2 => 'https://10.0.42.3:4242/v43/%(tenant_id)s'
:public_url_v2 => 'https://10.0.42.1:4242/v43',
:admin_url_v2 => 'https://10.0.42.2:4242/v43',
:internal_url_v2 => 'https://10.0.42.3:4242/v43'
)
end
@ -77,9 +77,9 @@ describe 'manila::keystone::auth' do
)}
it { is_expected.to contain_keystone_endpoint('RegionThree/manilav2::sharev2').with(
:ensure => 'present',
:public_url => 'https://10.0.42.1:4242/v43/%(tenant_id)s',
:admin_url => 'https://10.0.42.2:4242/v43/%(tenant_id)s',
:internal_url => 'https://10.0.42.3:4242/v43/%(tenant_id)s'
:public_url => 'https://10.0.42.1:4242/v43',
:admin_url => 'https://10.0.42.2:4242/v43',
:internal_url => 'https://10.0.42.3:4242/v43'
)}
end