From 169c88a8f4b9b5ad2b4bb8fdcb9f218ac3e28162 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 12 Oct 2024 01:35:07 +0900 Subject: [PATCH] Expose configure_service This parameter has been implemented in the underlying defined resource type but was not configurable. Change-Id: I9439d4b37cda8be922a4a1b8a6cc3acc7078ec6d --- manifests/keystone/auth.pp | 6 ++++++ manifests/keystone/auth_inspector.pp | 6 ++++++ releasenotes/notes/configure_service-d3637d5ac22e0496.yaml | 7 +++++++ spec/classes/ironic_keystone_auth_inspector_spec.rb | 3 +++ spec/classes/ironic_keystone_auth_spec.rb | 3 +++ 5 files changed, 25 insertions(+) create mode 100644 releasenotes/notes/configure_service-d3637d5ac22e0496.yaml diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index d81cf619..b10f9da4 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -60,6 +60,10 @@ # (Optional) Should the admin role be configured for the service user? # Defaults to true. # +# [*configure_service*] +# (Optional) Should the service be configurd? +# Defaults to True +# # [*service_name*] # (Optional) Name of the service. # Defaults to the value of 'ironic'. @@ -110,6 +114,7 @@ class ironic::keystone::auth ( Boolean $configure_endpoint = true, Boolean $configure_user = true, Boolean $configure_user_role = true, + Boolean $configure_service = true, String[1] $service_name = 'ironic', String[1] $service_type = 'baremetal', String[1] $service_description = 'Ironic Bare Metal Provisioning Service', @@ -127,6 +132,7 @@ class ironic::keystone::auth ( configure_user => $configure_user, configure_user_role => $configure_user_role, configure_endpoint => $configure_endpoint, + configure_service => $configure_service, service_name => $service_name, service_type => $service_type, auth_name => $auth_name, diff --git a/manifests/keystone/auth_inspector.pp b/manifests/keystone/auth_inspector.pp index cb50e7fd..8ee9a4ff 100644 --- a/manifests/keystone/auth_inspector.pp +++ b/manifests/keystone/auth_inspector.pp @@ -56,6 +56,10 @@ # (Optional) Should the admin role be configured for the service user? # Defaults to 'true'. # +# [*configure_service*] +# (Optional) Should the service be configurd? +# Defaults to True +# # [*service_name*] # (Optional) Name of the service. # Defaults to the value of auth_name, but must differ from the value. @@ -101,6 +105,7 @@ class ironic::keystone::auth_inspector ( Boolean $configure_endpoint = true, Boolean $configure_user = true, Boolean $configure_user_role = true, + Boolean $configure_service = true, Optional[String[1]] $service_name = undef, String[1] $service_type = 'baremetal-introspection', String[1] $service_description = 'Bare Metal Introspection Service', @@ -120,6 +125,7 @@ class ironic::keystone::auth_inspector ( configure_user => $configure_user, configure_user_role => $configure_user_role, configure_endpoint => $configure_endpoint, + configure_service => $configure_service, service_name => $real_service_name, service_type => $service_type, auth_name => $auth_name, diff --git a/releasenotes/notes/configure_service-d3637d5ac22e0496.yaml b/releasenotes/notes/configure_service-d3637d5ac22e0496.yaml new file mode 100644 index 00000000..66bcb1ef --- /dev/null +++ b/releasenotes/notes/configure_service-d3637d5ac22e0496.yaml @@ -0,0 +1,7 @@ +--- +features: + - | + The following two parameter have been added. + + - ``ironic::keystone::auth::configure_service`` + - ``ironic::keystone::auth_inspector::configure_service`` diff --git a/spec/classes/ironic_keystone_auth_inspector_spec.rb b/spec/classes/ironic_keystone_auth_inspector_spec.rb index e6e719b9..bc90810b 100644 --- a/spec/classes/ironic_keystone_auth_inspector_spec.rb +++ b/spec/classes/ironic_keystone_auth_inspector_spec.rb @@ -32,6 +32,7 @@ describe 'ironic::keystone::auth_inspector' do :configure_user => true, :configure_user_role => true, :configure_endpoint => true, + :configure_service => true, :service_name => 'ironic-inspector', :service_type => 'baremetal-introspection', :auth_name => 'ironic-inspector', @@ -61,6 +62,7 @@ describe 'ironic::keystone::auth_inspector' do :configure_endpoint => false, :configure_user => false, :configure_user_role => false, + :configure_service => false, :service_description => 'Alternative Bare Metal Introspection Service', :service_name => 'alt_service', :service_type => 'alt_baremetal-introspection', @@ -74,6 +76,7 @@ describe 'ironic::keystone::auth_inspector' do :configure_user => false, :configure_user_role => false, :configure_endpoint => false, + :configure_service => false, :service_name => 'alt_service', :service_type => 'alt_baremetal-introspection', :auth_name => 'alt_ironic-inspector', diff --git a/spec/classes/ironic_keystone_auth_spec.rb b/spec/classes/ironic_keystone_auth_spec.rb index 7f79ceb4..97e48b57 100644 --- a/spec/classes/ironic_keystone_auth_spec.rb +++ b/spec/classes/ironic_keystone_auth_spec.rb @@ -31,6 +31,7 @@ describe 'ironic::keystone::auth' do :configure_user => true, :configure_user_role => true, :configure_endpoint => true, + :configure_service => true, :service_name => 'ironic', :service_type => 'baremetal', :service_description => 'Ironic Bare Metal Provisioning Service', @@ -60,6 +61,7 @@ describe 'ironic::keystone::auth' do :configure_endpoint => false, :configure_user => false, :configure_user_role => false, + :configure_service => false, :service_description => 'Alternative Ironic Bare Metal Provisioning Service', :service_name => 'alt_service', :service_type => 'alt_baremetal', @@ -73,6 +75,7 @@ describe 'ironic::keystone::auth' do :configure_user => false, :configure_user_role => false, :configure_endpoint => false, + :configure_service => false, :service_name => 'alt_service', :service_type => 'alt_baremetal', :service_description => 'Alternative Ironic Bare Metal Provisioning Service',