openstack/puppet-octavia
Code Issues Proposed changes

heatlh_manager default to os_workers

Browse Source 
health_manager has switched from spawning threads to processes. We
should have it follow the os_worker calculation.

Change-Id: I3abab863b210dcc6a75b70f9c14edb17e1713a97
This commit is contained in:
Joe Talerico
2018-12-20 12:54:58 -05:00
committed by Alex Schultz
parent a48d9b3076
commit 5e7845e20f
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/health_manager.pp
View File

@@ -25,6 +25,10 @@
# (optional) The bind ip for the health manager # (optional) The bind ip for the health manager
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*workers*]
# (optional) The number of workers health_manager spawns
# Defaults to $::os_workers
#
# [*port*] # [*port*]
# (optional) The bind port for the health manager # (optional) The bind port for the health manager
# Defaults to $::os_service_default # Defaults to $::os_service_default
@@ -37,6 +41,7 @@ class octavia::health_manager (
$event_streamer_driver = $::os_service_default, $event_streamer_driver = $::os_service_default,
$ip = $::os_service_default, $ip = $::os_service_default,
$port = $::os_service_default, $port = $::os_service_default,
$workers = $::os_workers,
) inherits octavia::params { ) inherits octavia::params {
include ::octavia::deps include ::octavia::deps
@@ -71,5 +76,7 @@ class octavia::health_manager (
'health_manager/event_streamer_driver' : value => $event_streamer_driver; 'health_manager/event_streamer_driver' : value => $event_streamer_driver;
'health_manager/bind_ip' : value => $ip; 'health_manager/bind_ip' : value => $ip;
'health_manager/bind_port' : value => $port; 'health_manager/bind_port' : value => $port;
'health_manager/health_update_threads' : value => $workers;
'health_manager/stats_update_threads' : value => $workers;
} }
} }

4
releasenotes/notes/add-health_manager-worker-default-6259b601e01db4f3.yaml Normal file
View File

@@ -0,0 +1,4 @@
---
features:
- Add new parameter, "workers" to health_manager which
defaults to $::os_workers

11
spec/classes/octavia_health_manager_spec.rb
View File

@@ -33,6 +33,8 @@ describe 'octavia::health_manager' do
}) })
end end
it { is_expected.to contain_octavia_config('health_manager/heartbeat_key').with_value('abcdefghi') } it { is_expected.to contain_octavia_config('health_manager/heartbeat_key').with_value('abcdefghi') }
it { is_expected.to contain_octavia_config('health_manager/health_update_threads').with_value('2') }
it { is_expected.to contain_octavia_config('health_manager/stats_update_threads').with_value('2') }
end end
it 'installs octavia-health-manager package' do it 'installs octavia-health-manager package' do
@@ -97,6 +99,15 @@ describe 'octavia::health_manager' do
it { is_expected.to contain_octavia_config('health_manager/bind_port').with_value('5555') } it { is_expected.to contain_octavia_config('health_manager/bind_port').with_value('5555') }
end end
context 'configured with specific parameters' do
before do
params.merge!({
:workers => 8,
})
end
it { is_expected.to contain_octavia_config('health_manager/health_update_threads').with_value(8) }
it { is_expected.to contain_octavia_config('health_manager/stats_update_threads').with_value(8) }
end
end end
on_supported_os({ on_supported_os({