openstack/puppet-ironic
Code Issues Proposed changes

api: Remove redundant hard-coded defaults

Browse Source 
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
This commit is contained in:
Takashi Kajinami
2023-03-16 13:45:24 +09:00
parent 8b8659e8ca
commit f54403a202
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/api.pp
View File

@@ -78,9 +78,9 @@ class ironic::api (
$manage_service = true, $manage_service = true,
$enabled = true, $enabled = true,
$service_name = $::ironic::params::api_service, $service_name = $::ironic::params::api_service,
$host_ip = '0.0.0.0', $host_ip = $facts['os_service_default'],
$port = '6385', $port = $facts['os_service_default'],
$max_limit = '1000', $max_limit = $facts['os_service_default'],
$workers = $facts['os_service_default'], $workers = $facts['os_service_default'],
$public_endpoint = $facts['os_service_default'], $public_endpoint = $facts['os_service_default'],
$enable_proxy_headers_parsing = $facts['os_service_default'], $enable_proxy_headers_parsing = $facts['os_service_default'],

9
spec/classes/ironic_api_spec.rb
View File

@@ -30,9 +30,6 @@ describe 'ironic::api' do
let :params do let :params do
{ :package_ensure => 'present', { :package_ensure => 'present',
:enabled => true, :enabled => true,
:port => '6385',
:max_limit => '1000',
:host_ip => '0.0.0.0',
} }
end end
@@ -64,9 +61,9 @@ describe 'ironic::api' do
end end
it 'configures ironic.conf' do it 'configures ironic.conf' do
is_expected.to contain_ironic_config('api/port').with_value(p[:port]) is_expected.to contain_ironic_config('api/port').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('api/host_ip').with_value(p[:host_ip]) is_expected.to contain_ironic_config('api/host_ip').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('api/max_limit').with_value(p[:max_limit]) is_expected.to contain_ironic_config('api/max_limit').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('api/api_workers').with_value('<SERVICE DEFAULT>') is_expected.to contain_ironic_config('api/api_workers').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('api/public_endpoint').with_value('<SERVICE DEFAULT>') is_expected.to contain_ironic_config('api/public_endpoint').with_value('<SERVICE DEFAULT>')
is_expected.to contain_oslo__middleware('ironic_config').with( is_expected.to contain_oslo__middleware('ironic_config').with(