openstack
/
puppet-qdr
Code Issues Proposed changes

Fix ignored qdr::router_* parameters 

Partial-Bug: #2012200
Change-Id: I3dcdba8e456af5b293aa3c3266489ca3dd6a4e94
This commit is contained in:
Takashi Kajinami 2023-03-20 03:14:08 +09:00
parent 3152b13eed
commit 8c1faac656
3 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
releasenotes/notes/bug-2012200-e1ad2cf50200b566.yaml Normal file
View File

@ -0,0 +1,10 @@
---
fixes:
- |
Fixed the following ``qdr`` claas parameters ignored.
- ``router_hello_interval``
- ``router_hello_max_age``
- ``router_ra_interval``
- ``router_ra_interval_flux``
- ``router_remote_ls_max_age``

31
spec/classes/qdr_init_spec.rb
View File

@ -73,6 +73,11 @@ describe 'qdr' do
it do
should contain_file('qdrouterd.conf').with_content(/mode: standalone/)
should contain_file('qdrouterd.conf').with_content(/workerThreads: 8/)
should contain_file('qdrouterd.conf').with_content(/helloIntervalSeconds: 1/)
should contain_file('qdrouterd.conf').with_content(/helloMaxAgeSeconds: 3/)
should contain_file('qdrouterd.conf').with_content(/raIntervalSeconds: 30/)
should contain_file('qdrouterd.conf').with_content(/raIntervalFluxSeconds: 4/)
should contain_file('qdrouterd.conf').with_content(/remoteLsMaxAgeSeconds: 60/)
should contain_file('qdrouterd.conf').with_content(/host: 127.0.0.1/)
should contain_file('qdrouterd.conf').with_content(/port: 5672/)
should contain_file('qdrouterd.conf').with_content(/authenticatePeer: false/)
@ -87,19 +92,29 @@ describe 'qdr' do
let :params do
{
:router_worker_threads => '4',
:listener_addr => '10.1.1.1',
:listener_port => '5671',
:listener_auth_peer => true,
:listener_sasl_mech => 'ANONYMOUS DIGEST-MD5 EXTERNAL PLAIN',
:connectors => [{'role' => 'inter-router'}],
:extra_listeners => [{'mode' => 'interior'}],
:extra_addresses => [{'prefix' => 'exclusive'}]
:router_worker_threads => '4',
:router_hello_interval => 2,
:router_hello_max_age => 6,
:router_ra_interval => 60,
:router_ra_interval_flux => 8,
:router_remote_ls_max_age => 120,
:listener_addr => '10.1.1.1',
:listener_port => '5671',
:listener_auth_peer => true,
:listener_sasl_mech => 'ANONYMOUS DIGEST-MD5 EXTERNAL PLAIN',
:connectors => [{'role' => 'inter-router'}],
:extra_listeners => [{'mode' => 'interior'}],
:extra_addresses => [{'prefix' => 'exclusive'}],
}
end
it do
should contain_file('qdrouterd.conf').with_content(/workerThreads: 4/)
should contain_file('qdrouterd.conf').with_content(/helloIntervalSeconds: 2/)
should contain_file('qdrouterd.conf').with_content(/helloMaxAgeSeconds: 6/)
should contain_file('qdrouterd.conf').with_content(/raIntervalSeconds: 60/)
should contain_file('qdrouterd.conf').with_content(/raIntervalFluxSeconds: 8/)
should contain_file('qdrouterd.conf').with_content(/remoteLsMaxAgeSeconds: 120/)
should contain_file('qdrouterd.conf').with_content(/host: 10.1.1.1/)
should contain_file('qdrouterd.conf').with_content(/port: 5671/)
should contain_file('qdrouterd.conf').with_content(/authenticatePeer: true/)

5
templates/qdrouterd.conf.erb
View File

@ -27,6 +27,11 @@ router {
debugDump: <%= @router_debug_dump %>
saslConfigPath: <%= @router_sasl_path %>
saslConfigName: <%= @router_sasl_name %>
helloIntervalSeconds: <%= @router_hello_interval %>
helloMaxAgeSeconds: <%= @router_hello_max_age %>
raIntervalSeconds: <%= @router_ra_interval %>
raIntervalFluxSeconds: <%= @router_ra_interval_flux %>
remoteLsMaxAgeSeconds: <%= @router_remote_ls_max_age %>
}
<%- if @listener_require_ssl -%>