From 5bd12fd7f4f3a6f8ed5104021ed541e569a00393 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 15 Dec 2023 16:42:32 +0900 Subject: [PATCH] kmip: Leverage the service default The kmip plugin uses the reasonable default tcp port (5969) in case the port option is not set. Change-Id: Ic32a397e93479f7d54e22e3f94e35c7c95dbbca4 --- manifests/plugins/kmip.pp | 5 +++-- spec/classes/barbican_plugins_kmip_spec.rb | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/plugins/kmip.pp b/manifests/plugins/kmip.pp index a08a1770..a21c30e4 100644 --- a/manifests/plugins/kmip.pp +++ b/manifests/plugins/kmip.pp @@ -8,7 +8,8 @@ # (required) username for KMIP device # # [*kmip_plugin_port*] -# (required) port for KMIP device +# (optional) port for KMIP device +# Defaults to $facts['os_service_default'] # # [*kmip_plugin_username*] # (optional) username for KMIP device @@ -40,7 +41,7 @@ # class barbican::plugins::kmip ( $kmip_plugin_host, - $kmip_plugin_port, + $kmip_plugin_port = $facts['os_service_default'], $kmip_plugin_username = $facts['os_service_default'], $kmip_plugin_password = $facts['os_service_default'], $kmip_plugin_keyfile = $facts['os_service_default'], diff --git a/spec/classes/barbican_plugins_kmip_spec.rb b/spec/classes/barbican_plugins_kmip_spec.rb index 4f502606..b45b9eeb 100644 --- a/spec/classes/barbican_plugins_kmip_spec.rb +++ b/spec/classes/barbican_plugins_kmip_spec.rb @@ -29,7 +29,6 @@ describe 'barbican::plugins::kmip' do :kmip_plugin_username => 'kmip_user', :kmip_plugin_password => 'kmip_password', :kmip_plugin_host => 'kmip_host', - :kmip_plugin_port => 9000, :global_default => true } end @@ -48,7 +47,7 @@ describe 'barbican::plugins::kmip' do is_expected.to contain_barbican_config('kmip_plugin/host')\ .with_value(params[:kmip_plugin_host]) is_expected.to contain_barbican_config('kmip_plugin/port')\ - .with_value(params[:kmip_plugin_port]) + .with_value('') is_expected.to contain_barbican_config( 'secretstore:kmip/secret_store_plugin') \ .with_value('kmip_plugin')