openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "manila: Drop deprecated parameters to disable manila v2 user"

Browse Source
This commit is contained in:
Zuul
2025-06-23 22:19:24 +00:00
committed by Gerrit Code Review
parent 91c4152c3f 2fcfffeb2f
commit a96e4b5ca8
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/manila.pp
View File

@@ -37,16 +37,14 @@ class openstack_integration::manila (
host => $::openstack_integration::config::host, host => $::openstack_integration::config::host,
} }
class { 'manila::keystone::auth': class { 'manila::keystone::auth':
public_url => "${::openstack_integration::config::base_url}:8786/v1/%(tenant_id)s", public_url => "${::openstack_integration::config::base_url}:8786/v1/%(tenant_id)s",
internal_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", admin_url => "${::openstack_integration::config::base_url}:8786/v1/%(tenant_id)s",
public_url_v2 => "${::openstack_integration::config::base_url}:8786/v2", public_url_v2 => "${::openstack_integration::config::base_url}:8786/v2",
internal_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", admin_url_v2 => "${::openstack_integration::config::base_url}:8786/v2",
roles => ['admin', 'service'], roles => ['admin', 'service'],
password => 'a_big_secret', password => 'a_big_secret',
configure_user_v2 => false,
configure_user_role_v2 => false,
} }
class { 'manila::logging': class { 'manila::logging':
debug => true, debug => true,