From 004cb754074fc4b41c6e27b5ae07e328a7b28a3c Mon Sep 17 00:00:00 2001
From: Goutham Pacha Ravi <gouthampravi@gmail.com>
Date: Tue, 27 Jul 2021 23:02:37 -0700
Subject: [PATCH] [manila] Drop tenant_id templating from v2 endpoint
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
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
Change-Id: Ice359bc31429a5da403598b9b4a0e1a95d71b83f
---
ansible/roles/manila/defaults/main.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ansible/roles/manila/defaults/main.yml b/ansible/roles/manila/defaults/main.yml
index 84bdc3c85..48b703b99 100644
--- a/ansible/roles/manila/defaults/main.yml
+++ b/ansible/roles/manila/defaults/main.yml
@@ -183,9 +183,9 @@ manila_admin_endpoint: "{{ manila_admin_base_endpoint }}/v1/%(tenant_id)s"
manila_internal_endpoint: "{{ manila_internal_base_endpoint }}/v1/%(tenant_id)s"
manila_public_endpoint: "{{ manila_public_base_endpoint }}/v1/%(tenant_id)s"
-manila_v2_admin_endpoint: "{{ manila_admin_base_endpoint }}/v2/%(tenant_id)s"
-manila_v2_internal_endpoint: "{{ manila_internal_base_endpoint }}/v2/%(tenant_id)s"
-manila_v2_public_endpoint: "{{ manila_public_base_endpoint }}/v2/%(tenant_id)s"
+manila_v2_admin_endpoint: "{{ manila_admin_base_endpoint }}/v2"
+manila_v2_internal_endpoint: "{{ manila_internal_base_endpoint }}/v2"
+manila_v2_public_endpoint: "{{ manila_public_base_endpoint }}/v2"
manila_logging_debug: "{{ openstack_logging_debug }}"
--
GitLab