openstack/puppet-mistral
Code Issues Proposed changes

Fix ignored configure_service

Browse Source 
Change-Id: Ie62c370b1148cde8baa7003b5e9e0fda1978f48f
This commit is contained in:
Takashi Kajinami 2024-10-12 12:16:41 +09:00
parent debde5b5f1
commit f2a9cd161c
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/keystone/auth.pp
View File

@ -39,6 +39,14 @@
# (Optional) Should the service user be configured? # (Optional) Should the service user be configured?
# Defaults to true. # Defaults to true.
# #
# [*configure_user_role*]
# (Optional) Whether to configure the admin role for the service user.
# Defaults to true
#
# [*configure_service*]
# (Optional) Should mistral service be configured?
# Defaults to true.
#
# [*service_type*] # [*service_type*]
# (Optional) Type of service. # (Optional) Type of service.
# Defaults to 'workflowv2'. # Defaults to 'workflowv2'.
@ -63,18 +71,10 @@
# (Optional) Name of the service. # (Optional) Name of the service.
# Defaults to 'mistral'. # Defaults to 'mistral'.
# #
# [*configure_service*]
# (Optional) Should mistral service be configured?
# Defaults to true.
#
# [*service_description*] # [*service_description*]
# (Optional) Description for keystone service. # (Optional) Description for keystone service.
# Defaults to 'Openstack workflow Service'. # Defaults to 'Openstack workflow Service'.
# [*configure_user_role*]
# (Optional) Whether to configure the admin role for the service user.
# Defaults to true
#
class mistral::keystone::auth( class mistral::keystone::auth(
String[1] $password, String[1] $password,
String[1] $email = 'mistral@localhost', String[1] $email = 'mistral@localhost',
@ -90,9 +90,9 @@ class mistral::keystone::auth(
String[1] $system_scope = 'all', String[1] $system_scope = 'all',
Array[String[1]] $system_roles = [], Array[String[1]] $system_roles = [],
Boolean $configure_endpoint = true, Boolean $configure_endpoint = true,
Boolean $configure_service = true,
Boolean $configure_user = true, Boolean $configure_user = true,
Boolean $configure_user_role = true, Boolean $configure_user_role = true,
Boolean $configure_service = true,
String[1] $service_description = 'OpenStack Workflow Service', String[1] $service_description = 'OpenStack Workflow Service',
) { ) {
@ -104,6 +104,7 @@ class mistral::keystone::auth(
configure_user => $configure_user, configure_user => $configure_user,
configure_user_role => $configure_user_role, configure_user_role => $configure_user_role,
configure_endpoint => $configure_endpoint, configure_endpoint => $configure_endpoint,
configure_service => $configure_service,
service_type => $service_type, service_type => $service_type,
service_description => $service_description, service_description => $service_description,
service_name => $service_name, service_name => $service_name,

3
spec/classes/mistral_keystone_auth_spec.rb
View File

@ -15,6 +15,7 @@ describe 'mistral::keystone::auth' do
:configure_user => true, :configure_user => true,
:configure_user_role => true, :configure_user_role => true,
:configure_endpoint => true, :configure_endpoint => true,
:configure_service => true,
:service_name => 'mistral', :service_name => 'mistral',
:service_type => 'workflowv2', :service_type => 'workflowv2',
:service_description => 'OpenStack Workflow Service', :service_description => 'OpenStack Workflow Service',
@ -44,6 +45,7 @@ describe 'mistral::keystone::auth' do
:configure_endpoint => false, :configure_endpoint => false,
:configure_user => false, :configure_user => false,
:configure_user_role => false, :configure_user_role => false,
:configure_service => false,
:service_description => 'Alternative OpenStack Workflow Service', :service_description => 'Alternative OpenStack Workflow Service',
:service_name => 'alt_service', :service_name => 'alt_service',
:service_type => 'alt_workflowv2', :service_type => 'alt_workflowv2',
@ -57,6 +59,7 @@ describe 'mistral::keystone::auth' do
:configure_user => false, :configure_user => false,
:configure_user_role => false, :configure_user_role => false,
:configure_endpoint => false, :configure_endpoint => false,
:configure_service => false,
:service_name => 'alt_service', :service_name => 'alt_service',
:service_type => 'alt_workflowv2', :service_type => 'alt_workflowv2',
:service_description => 'Alternative OpenStack Workflow Service', :service_description => 'Alternative OpenStack Workflow Service',