From f54403a202a458a12ff3b091d02016f455c8aba3 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 16 Mar 2023 13:45:24 +0900 Subject: [PATCH] api: Remove redundant hard-coded defaults The values baked in the class are same as the service defaults, thus can be replaced by the os_service_default fact. This allows us to leverage any change in underlying service timely. Change-Id: Ie4655381ffda7ac238c08c172c12d09bf4e4bbd2 --- manifests/api.pp | 6 +++--- spec/classes/ironic_api_spec.rb | 9 +++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/manifests/api.pp b/manifests/api.pp index 57e60776..cfc7f12c 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -78,9 +78,9 @@ class ironic::api ( $manage_service = true, $enabled = true, $service_name = $::ironic::params::api_service, - $host_ip = '0.0.0.0', - $port = '6385', - $max_limit = '1000', + $host_ip = $facts['os_service_default'], + $port = $facts['os_service_default'], + $max_limit = $facts['os_service_default'], $workers = $facts['os_service_default'], $public_endpoint = $facts['os_service_default'], $enable_proxy_headers_parsing = $facts['os_service_default'], diff --git a/spec/classes/ironic_api_spec.rb b/spec/classes/ironic_api_spec.rb index c16dbf69..c520fa33 100644 --- a/spec/classes/ironic_api_spec.rb +++ b/spec/classes/ironic_api_spec.rb @@ -30,9 +30,6 @@ describe 'ironic::api' do let :params do { :package_ensure => 'present', :enabled => true, - :port => '6385', - :max_limit => '1000', - :host_ip => '0.0.0.0', } end @@ -64,9 +61,9 @@ describe 'ironic::api' do end it 'configures ironic.conf' do - is_expected.to contain_ironic_config('api/port').with_value(p[:port]) - is_expected.to contain_ironic_config('api/host_ip').with_value(p[:host_ip]) - is_expected.to contain_ironic_config('api/max_limit').with_value(p[:max_limit]) + is_expected.to contain_ironic_config('api/port').with_value('') + is_expected.to contain_ironic_config('api/host_ip').with_value('') + is_expected.to contain_ironic_config('api/max_limit').with_value('') is_expected.to contain_ironic_config('api/api_workers').with_value('') is_expected.to contain_ironic_config('api/public_endpoint').with_value('') is_expected.to contain_oslo__middleware('ironic_config').with(