From 662944827a558705e91a125e94017775c1533201 Mon Sep 17 00:00:00 2001
From: Alan Bishop <abishop@redhat.com>
Date: Tue, 1 Mar 2022 12:33:49 -0800
Subject: [PATCH] Remove tenant_id templating from cinder endpoints

Cinder no longer requires a project_id in its API URLs.

Depends-On: https://review.opendev.org/822040
Change-Id: Ib35ab63612f31cf30f43256f60f4a226aaae5cac
---
 manifests/cinder.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/cinder.pp b/manifests/cinder.pp
index 3ee9e334c..1abd396cc 100644
--- a/manifests/cinder.pp
+++ b/manifests/cinder.pp
@@ -46,9 +46,9 @@ class openstack_integration::cinder (
     password => 'cinder',
   }
   class { 'cinder::keystone::auth':
-    public_url_v3   => "${::openstack_integration::config::base_url}:8776/v3/%(tenant_id)s",
-    internal_url_v3 => "${::openstack_integration::config::base_url}:8776/v3/%(tenant_id)s",
-    admin_url_v3    => "${::openstack_integration::config::base_url}:8776/v3/%(tenant_id)s",
+    public_url_v3   => "${::openstack_integration::config::base_url}:8776/v3",
+    internal_url_v3 => "${::openstack_integration::config::base_url}:8776/v3",
+    admin_url_v3    => "${::openstack_integration::config::base_url}:8776/v3",
     password        => 'a_big_secret',
   }
   class { 'cinder::logging':