openstack/puppet-manila
Code Issues Proposed changes

Do not create manila_v2 keystone user by default

Browse Source 
Manila service itself does not need the dedicated user to provide share
v2 API, and having the single manila user is enough.

Change-Id: I392109198247bd032c7c5014935a0c6cb9802f43
This commit is contained in:
Takashi Kajinami 2024-09-17 00:12:45 +09:00
parent 2dc0ec3943
commit d16d8f92cc
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/keystone/auth.pp
View File

@ -97,11 +97,11 @@
#
# [*configure_user_v2*]
# (Optional) Should the v2 service user be configured?
# Defaults to true
# Defaults to false
#
# [*configure_user_role_v2*]
# (Optional) Should the admin role be configured for the v2 service user?
# Defaults to true
# Defaults to false
#
# [*service_type_v2*]
# (Optional) Type of service v2. Optional.
@ -150,9 +150,9 @@ class manila::keystone::auth (
Boolean $configure_endpoint = true,
Boolean $configure_endpoint_v2 = true,
Boolean $configure_user = true,
Boolean $configure_user_v2 = true,
Boolean $configure_user_v2 = false,
Boolean $configure_user_role = true,
Boolean $configure_user_role_v2 = true,
Boolean $configure_user_role_v2 = false,
String[1] $service_type = 'share',
String[1] $service_type_v2 = 'sharev2',
String[1] $service_description = 'Manila Service',

9
releasenotes/notes/disable-user-v2-31ceee5fee7653fa.yaml Normal file
View File

@ -0,0 +1,9 @@
---
upgrade:
- |
Default value of the following parameters have been changed from ``true``
to ``false``. Because of this change, the ``manila::keystone::auth`` class
no longer creates the additional keystone user for v2 API by default.
- ``manila::keystone::auth::configure_user_v2``
- ``manila::keystone::auth::configure_user_role_v2``

12
spec/classes/manila_keystone_auth_spec.rb
View File

@ -32,8 +32,8 @@ describe 'manila::keystone::auth' do
) }
it { is_expected.to contain_keystone__resource__service_identity('manilav2').with(
:configure_user => true,
:configure_user_role => true,
:configure_user => false,
:configure_user_role => false,
:configure_endpoint => true,
:service_name => 'manilav2',
:service_type => 'sharev2',
@ -75,8 +75,8 @@ describe 'manila::keystone::auth' do
:auth_name_v2 => 'alt_manilav2',
:email_v2 => 'alt_manilav2@alt_localhost',
:configure_endpoint_v2 => false,
:configure_user_v2 => false,
:configure_user_role_v2 => false,
:configure_user_v2 => true,
:configure_user_role_v2 => true,
:service_description_v2 => 'Alternative Manila Service v2',
:service_name_v2 => 'alt_servicev2',
:service_type_v2 => 'alt_sharev2',
@ -106,8 +106,8 @@ describe 'manila::keystone::auth' do
) }
it { is_expected.to contain_keystone__resource__service_identity('manilav2').with(
:configure_user => false,
:configure_user_role => false,
:configure_user => true,
:configure_user_role => true,
:configure_endpoint => false,
:service_name => 'alt_servicev2',
:service_type => 'alt_sharev2',