openstack/puppet-nova
Code Issues Proposed changes

Remove redundant default of [api] use_forwarded_for

Browse Source 
This parameter defaults to false, thus the hard-coded default can be
replaced by $::os_service_default.

Change-Id: I8a2f5a0e34010cd58032df0a3d858aff17647a7a
This commit is contained in:
Takashi Kajinami 2022-04-23 00:17:11 +09:00
parent a383e17b97
commit 8761795c43
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/api.pp
View File

@ -39,7 +39,7 @@
# [*use_forwarded_for*] # [*use_forwarded_for*]
# (optional) Treat X-Forwarded-For as the canonical remote address. Only # (optional) Treat X-Forwarded-For as the canonical remote address. Only
# enable this if you have a sanitizing proxy. # enable this if you have a sanitizing proxy.
# Defaults to false # Defaults to $::os_service_default
# #
# [*osapi_compute_workers*] # [*osapi_compute_workers*]
# (optional) Number of workers for OpenStack API service # (optional) Number of workers for OpenStack API service
@ -200,7 +200,7 @@ class nova::api(
$metadata_listen = $::os_service_default, $metadata_listen = $::os_service_default,
$metadata_listen_port = $::os_service_default, $metadata_listen_port = $::os_service_default,
$enabled_apis = ['osapi_compute', 'metadata'], $enabled_apis = ['osapi_compute', 'metadata'],
$use_forwarded_for = false, $use_forwarded_for = $::os_service_default,
$osapi_compute_workers = $::os_workers, $osapi_compute_workers = $::os_workers,
$metadata_workers = $::os_workers, $metadata_workers = $::os_workers,
$sync_db = true, $sync_db = true,

1
spec/classes/nova_api_spec.rb
View File

@ -49,6 +49,7 @@ describe 'nova::api' do
is_expected.to contain_nova_config('wsgi/api_paste_config').with_value('api-paste.ini') is_expected.to contain_nova_config('wsgi/api_paste_config').with_value('api-paste.ini')
is_expected.to contain_nova_config('DEFAULT/osapi_compute_listen').with_value('<SERVICE DEFAULT>') is_expected.to contain_nova_config('DEFAULT/osapi_compute_listen').with_value('<SERVICE DEFAULT>')
is_expected.to contain_nova_config('DEFAULT/osapi_compute_listen_port').with_value('<SERVICE DEFAULT>') is_expected.to contain_nova_config('DEFAULT/osapi_compute_listen_port').with_value('<SERVICE DEFAULT>')
is_expected.to contain_nova_config('api/use_forwarded_for').with_value('<SERVICE DEFAULT>')
is_expected.to contain_nova_config('DEFAULT/metadata_listen').with_value('<SERVICE DEFAULT>') is_expected.to contain_nova_config('DEFAULT/metadata_listen').with_value('<SERVICE DEFAULT>')
is_expected.to contain_nova_config('DEFAULT/metadata_listen_port').with_value('<SERVICE DEFAULT>') is_expected.to contain_nova_config('DEFAULT/metadata_listen_port').with_value('<SERVICE DEFAULT>')
is_expected.to contain_nova_config('DEFAULT/osapi_compute_workers').with_value('5') is_expected.to contain_nova_config('DEFAULT/osapi_compute_workers').with_value('5')