openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "manila: Disable v1 API endpoints"

Browse Source
This commit is contained in:
Zuul
2026-02-26 09:25:53 +00:00
committed by Gerrit Code Review
parent faeb9c58bf 189f475420
commit 175d56e8f3
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/manila.pp
View File

@@ -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,

1
manifests/tempest.pp
View File

@@ -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,