openstack/puppet-neutron
Code Issues Proposed changes

Do not re-define default of [DEFAULT] control_exchange

Browse Source 
[DEFAULT] control_exchange defaults to 'neutron' in neutron processes,
and we can safely use the service default.

Change-Id: I1f5321f5dc1857254466d2ebed7904aca6f14b69
This commit is contained in:
Takashi Kajinami
2021-12-03 09:25:31 +09:00
parent fb68425dce
commit 906f8c1613
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/init.pp
View File

@@ -104,7 +104,7 @@
#
# [*control_exchange*]
# (optional) What RPC queue/exchange to use
# Defaults to neutron
# Defaults to $::os_service_default
#
# [*executor_thread_pool_size*]
# (optional) Size of executor thread pool when executor is threading or eventlet.
@@ -348,7 +348,7 @@ class neutron (
$root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
$root_helper_daemon = $::os_service_default,
$report_interval = $::os_service_default,
$control_exchange = 'neutron',
$control_exchange = $::os_service_default,
$executor_thread_pool_size = $::os_service_default,
$default_transport_url = $::os_service_default,
$rpc_response_timeout = $::os_service_default,

2
spec/classes/neutron_init_spec.rb
View File

@@ -102,7 +102,7 @@ describe 'neutron' do
should contain_neutron_config('DEFAULT/allow_bulk').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('DEFAULT/allow_overlapping_ips').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('DEFAULT/api_extensions_path').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('DEFAULT/control_exchange').with_value('neutron')
should contain_neutron_config('DEFAULT/control_exchange').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('DEFAULT/state_path').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('oslo_concurrency/lock_path').with_value('$state_path/lock')
should contain_neutron_config('DEFAULT/executor_thread_pool_size').with_value('<SERVICE DEFAULT>')