From fcce817599a20d4924e69cca45cf608d9f82fb42 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 23 Feb 2026 22:53:02 +0900 Subject: [PATCH] manila: Enable shared-file-system service type Depends-on: https://review.opendev.org/977641 Change-Id: I9b44cb6819b94e1f3139146d7e7bd0cb7777454a Signed-off-by: Takashi Kajinami --- manifests/manila.pp | 11 +++++------ manifests/tempest.pp | 3 ++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/manifests/manila.pp b/manifests/manila.pp index 74299796e..c792d11da 100644 --- a/manifests/manila.pp +++ b/manifests/manila.pp @@ -36,12 +36,11 @@ class openstack_integration::manila ( host => $openstack_integration::config::host, } class { 'manila::keystone::auth': - 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', + 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 e628152d2..fd0c1c0a5 100644 --- a/manifests/tempest.pp +++ b/manifests/tempest.pp @@ -367,7 +367,8 @@ 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', + # TODO(tkajinam): Remove this once new manila-tempest-plugin is available + share_catalog_type => 'shared-file-system', share_multitenancy_enabled => false, share_enable_protocols => [downcase($share_protocol)], share_capability_storage_protocol => $share_protocol,