openstack
/
puppet-designate
Code Issues Proposed changes

Use os_workers when applicable 

This uses os_workers as default for every workers config setting of the
various services.

Change-Id: I828f7fd8000d8e386b4d794ba8bf308599aa5491
This commit is contained in:
Thomas Herve 2017-11-27 21:45:45 +01:00
parent 71a4c5cc89
commit 34e606c795
11 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/api.pp
View File

@ -46,7 +46,7 @@
#
# [*workers*]
# (optional) Number of api worker processes to spawn.
# Defaults to $::os_service_default
# Defaults to $::os_workers
#
# [*threads*]
# (optional) Number of api greenthreads to spawn.
@ -113,7 +113,7 @@ class designate::api (
$enable_api_admin = $::os_service_default,
$api_base_uri = $::os_service_default,
$listen = $::os_service_default,
$workers = $::os_service_default,
$workers = $::os_workers,
$threads = $::os_service_default,
$enable_host_header = $::os_service_default,
$max_header_line = $::os_service_default,

4
manifests/central.pp
View File

@ -43,7 +43,7 @@
#
# [*workers*]
# (optional) Number of central worker processes to spawn.
# Defaults to $::os_service_default
# Defaults to $::os_workers
#
# [*threads*]
# (optional) Number of central greenthreads to spawn.
@ -69,7 +69,7 @@ class designate::central (
$max_domain_name_len = '255',
$max_recordset_name_len = '255',
$min_ttl = $::os_service_default,
$workers = $::os_service_default,
$workers = $::os_workers,
$threads = $::os_service_default,
$default_pool_id = $::os_service_default,
# DEPRECATED PARAMETERS

4
manifests/mdns.pp
View File

@ -22,7 +22,7 @@
#
# [*workers*]
# (Optional) Number of mdns worker processes to spawn.
# Defaults to $::os_service_default.
# Defaults to $::os_workers.
#
# [*threads*]
# (Optional) Number of mdns greenthreads to spawn.
@ -67,7 +67,7 @@ class designate::mdns (
$mdns_package_name = $::designate::params::mdns_package_name,
$enabled = true,
$manage_service = 'running',
$workers = $::os_service_default,
$workers = $::os_workers,
$threads = $::os_service_default,
$tcp_backlog = $::os_service_default,
$tcp_recv_timeout = $::os_service_default,

4
manifests/pool_manager.pp
View File

@ -30,7 +30,7 @@
#
# [*workers*]
# (optional) Number of worker processes.
# Defaults to $::os_service_default
# Defaults to $::os_workers
#
# [*threads*]
# (optional) Number of Pool Manager greenthreads to spawn
@ -91,7 +91,7 @@ class designate::pool_manager(
$pool_manager_package_name = undef,
$enabled = true,
$service_ensure = 'running',
$workers = $::os_service_default,
$workers = $::os_workers,
$threads = $::os_service_default,
$threshold_percentage = $::os_service_default,
$poll_timeout = $::os_service_default,

4
manifests/worker.pp
View File

@ -27,7 +27,7 @@
#
# [*workers*]
# (optional) Number of worker processes.
# Defaults to $::os_service_default
# Defaults to $::os_workers
#
# [*threads*]
# (optional) Number of Pool Manager greenthreads to spawn
@ -71,7 +71,7 @@ class designate::worker(
$worker_package_name = undef,
$enabled = true,
$service_ensure = 'running',
$workers = $::os_service_default,
$workers = $::os_workers,
$threads = $::os_service_default,
$threshold_percentage = $::os_service_default,
$poll_timeout = $::os_service_default,

5
releasenotes/notes/os-workers-48f08c28765c9c77.yaml Normal file
View File

@ -0,0 +1,5 @@
---
other:
- |
Use os_workers as default for all workers config settings of the various
services.

4
spec/classes/designate_api_spec.rb
View File

@ -38,7 +38,7 @@ describe 'designate::api' do
is_expected.to contain_designate_config('service:api/enable_api_admin').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:api/api_base_uri').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:api/listen').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:api/workers').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:api/workers').with_value(8)
is_expected.to contain_designate_config('service:api/threads').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:api/enable_host_header').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:api/max_header_line').with_value('<SERVICE DEFAULT>')
@ -120,7 +120,7 @@ describe 'designate::api' do
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
facts.merge!(OSDefaults.get_facts({ :os_workers => 8 }))
end
let(:platform_params) do

4
spec/classes/designate_central_spec.rb
View File

@ -32,7 +32,7 @@ describe 'designate::central' do
is_expected.to contain_designate_config('service:central/max_domain_name_len').with_value('255')
is_expected.to contain_designate_config('service:central/max_recordset_name_len').with_value('255')
is_expected.to contain_designate_config('service:central/min_ttl').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:central/workers').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:central/workers').with_value(8)
is_expected.to contain_designate_config('service:central/threads').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:central/default_pool_id').with_value('<SERVICE DEFAULT>')
end
@ -59,7 +59,7 @@ describe 'designate::central' do
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
facts.merge!(OSDefaults.get_facts({ :os_workers => 8 }))
end
let(:platform_params) do

4
spec/classes/designate_mdns_spec.rb
View File

@ -28,7 +28,7 @@ describe 'designate::mdns' do
end
it 'configures designate-mdns with default parameters' do
is_expected.to contain_designate_config('service:mdns/workers').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:mdns/workers').with_value(8)
is_expected.to contain_designate_config('service:mdns/threads').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:mdns/tcp_backlog').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:mdns/tcp_recv_timeout').with_value('<SERVICE DEFAULT>')
@ -59,7 +59,7 @@ describe 'designate::mdns' do
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
facts.merge!(OSDefaults.get_facts({ :os_workers => 8 }))
end
let(:platform_params) do
case facts[:osfamily]

4
spec/classes/designate_pool_manager_spec.rb
View File

@ -54,7 +54,7 @@ describe 'designate::pool_manager' do
it 'configures designate-pool-manager with default parameters' do
is_expected.to contain_designate_config('service:pool_manager/pool_id').with_value( params[:pool_id] )
is_expected.to contain_designate_config('service:pool_manager/workers').with_value( '<SERVICE DEFAULT>' )
is_expected.to contain_designate_config('service:pool_manager/workers').with_value(8)
is_expected.to contain_designate_config('service:pool_manager/threads').with_value( '<SERVICE DEFAULT>' )
is_expected.to contain_designate_config('service:pool_manager/threshold_percentage').with_value( '<SERVICE DEFAULT>' )
is_expected.to contain_designate_config('service:pool_manager/poll_timeout').with_value( '<SERVICE DEFAULT>' )
@ -116,7 +116,7 @@ describe 'designate::pool_manager' do
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
facts.merge!(OSDefaults.get_facts({ :os_workers => 8 }))
end
let(:platform_params) do

4
spec/classes/designate_worker_spec.rb
View File

@ -48,7 +48,7 @@ describe 'designate::worker' do
end
it 'configures designate-worker with default parameters' do
is_expected.to contain_designate_config('service:worker/workers').with_value( '<SERVICE DEFAULT>' )
is_expected.to contain_designate_config('service:worker/workers').with_value(8)
is_expected.to contain_designate_config('service:worker/threads').with_value( '<SERVICE DEFAULT>' )
is_expected.to contain_designate_config('service:worker/threshold_percentage').with_value( '<SERVICE DEFAULT>' )
is_expected.to contain_designate_config('service:worker/poll_timeout').with_value( '<SERVICE DEFAULT>' )
@ -101,7 +101,7 @@ describe 'designate::worker' do
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
facts.merge!(OSDefaults.get_facts({ :os_workers => 8 }))
end
let(:platform_params) do