From 189f475420658a89e36cc82ca915fc51d62095fa Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 23 Feb 2026 22:33:00 +0900 Subject: [PATCH] manila: Disable v1 API endpoints Manila removed its v1 API. This is a prep work to re-organize the implementation for keystone resource management accordingly. Depends-on: https://review.opendev.org/959554 Change-Id: I27fa7b9b50cba26472f57cf7f048deab3f4095a8 Signed-off-by: Takashi Kajinami --- manifests/manila.pp | 14 ++++++-------- manifests/tempest.pp | 1 + 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/manifests/manila.pp b/manifests/manila.pp index da718db8c..74299796e 100644 --- a/manifests/manila.pp +++ b/manifests/manila.pp @@ -36,14 +36,12 @@ class openstack_integration::manila ( host => $openstack_integration::config::host, } class { 'manila::keystone::auth': - public_url => "${openstack_integration::config::base_url}:8786/v1/%(tenant_id)s", - internal_url => "${openstack_integration::config::base_url}:8786/v1/%(tenant_id)s", - admin_url => "${openstack_integration::config::base_url}:8786/v1/%(tenant_id)s", - public_url_v2 => "${openstack_integration::config::base_url}:8786/v2", - internal_url_v2 => "${openstack_integration::config::base_url}:8786/v2", - admin_url_v2 => "${openstack_integration::config::base_url}:8786/v2", - roles => ['admin', 'service'], - password => 'a_big_secret', + configure_endpoint => false, + public_url_v2 => "${openstack_integration::config::base_url}:8786/v2", + internal_url_v2 => "${openstack_integration::config::base_url}:8786/v2", + admin_url_v2 => "${openstack_integration::config::base_url}:8786/v2", + roles => ['admin', 'service'], + password => 'a_big_secret', } class { 'manila::logging': debug => true, diff --git a/manifests/tempest.pp b/manifests/tempest.pp index a3a2e629c..e628152d2 100644 --- a/manifests/tempest.pp +++ b/manifests/tempest.pp @@ -367,6 +367,7 @@ class openstack_integration::tempest ( baremetal_driver => 'fake-hardware', baremetal_enabled_hardware_types => ['ipmi', 'fake-hardware'], load_balancer_test_with_noop => true, + share_catalog_type => 'sharev2', share_multitenancy_enabled => false, share_enable_protocols => [downcase($share_protocol)], share_capability_storage_protocol => $share_protocol,