openstack
/
puppet-sahara
Code Issues Proposed changes

Merge "Allow disabling management of service user and role"

This commit is contained in:
Zuul 2021-10-02 12:33:13 +00:00 committed by Gerrit Code Review
parent 355889a910 79295fbd5b
commit db33f6cbb2
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/keystone/auth.pp
View File

@ -27,6 +27,14 @@
# (Optional) Should Sahara endpoint be configured?
# Defaults to true.
#
# [*configure_user*]
# (Optional) Should the service user be configured?
# Defaults to true
#
# [*configure_user_role*]
# (Optional) Should the admin role be configured for the service user?
# Defaults to true
#
# [*service_type*]
# (Optional) Type of service.
# Defaults to 'data-processing'.
@ -72,6 +80,8 @@ class sahara::keystone::auth(
$service_type = 'data-processing',
$service_description = 'Sahara Data Processing',
$configure_endpoint = true,
$configure_user = true,
$configure_user_role = true,
$region = 'RegionOne',
$public_url = 'http://127.0.0.1:8386',
$admin_url = 'http://127.0.0.1:8386',
@ -81,8 +91,8 @@ class sahara::keystone::auth(
include sahara::deps
keystone::resource::service_identity { 'sahara':
configure_user => true,
configure_user_role => true,
configure_user => $configure_user,
configure_user_role => $configure_user_role,
configure_endpoint => $configure_endpoint,
service_type => $service_type,
service_description => $service_description,

8
releasenotes/notes/configure_user-and-user_role-674e4d5fcd799b6b.yaml Normal file
View File

@ -0,0 +1,8 @@
---
features:
- |
The following parameters have been added to the ``sahara::keystone::auth``
class.
- ``configure_user``
- ``configure_user_role``

6
spec/classes/sahara_keystone_auth_spec.rb
View File

@ -36,6 +36,8 @@ describe 'sahara::keystone::auth' do
:email => 'alt_sahara@alt_localhost',
:tenant => 'alt_service',
:configure_endpoint => false,
:configure_user => false,
:configure_user_role => false,
:service_description => 'Alternative Sahara Data Processing',
:service_name => 'alt_service',
:service_type => 'alt_data-processing',
@ -46,8 +48,8 @@ describe 'sahara::keystone::auth' do
end
it { is_expected.to contain_keystone__resource__service_identity('sahara').with(
:configure_user => true,
:configure_user_role => true,
:configure_user => false,
:configure_user_role => false,
:configure_endpoint => false,
:service_name => 'alt_service',
:service_type => 'alt_data-processing',