From 7bcaae05f631a3489223f47fabc5c1d3c151989c Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 13 Oct 2023 21:48:12 +0900 Subject: [PATCH] Remove cleanup of [DEFAULT] bind_host and bind_port The cleanup logic was added before 2023.1 release so we can assume these options are purged before a deployment is upgraded. Change-Id: If6949bb89b01104abe09515c6b93f7d7fed709d5 --- manifests/api.pp | 5 ----- spec/classes/barbican_api_spec.rb | 4 ---- 2 files changed, 9 deletions(-) diff --git a/manifests/api.pp b/manifests/api.pp index 25ae17da..265cf5cf 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -319,11 +319,6 @@ class barbican::api ( $host_href_real = $host_href } - barbican_config { - 'DEFAULT/bind_host': ensure => absent; - 'DEFAULT/bind_port': ensure => absent; - } - barbican_config { 'DEFAULT/host_href': value => $host_href_real; } diff --git a/spec/classes/barbican_api_spec.rb b/spec/classes/barbican_api_spec.rb index 135c3ede..6595115e 100644 --- a/spec/classes/barbican_api_spec.rb +++ b/spec/classes/barbican_api_spec.rb @@ -25,8 +25,6 @@ describe 'barbican::api' do let :default_params do { - :bind_host => '0.0.0.0', - :bind_port => '9311', :default_transport_url => '', :rpc_response_timeout => '', :control_exchange => '', @@ -77,8 +75,6 @@ describe 'barbican::api' do [ {}, { - :bind_host => '127.0.0.1', - :bind_port => '9312', :default_transport_url => 'rabbit://bugs:bugs_bunny@localhost:1234/rabbithost', :rpc_response_timeout => '120', :control_exchange => 'barbican',