Change the default for octavia-worker workers to os_workers
Previously this was set to os_service_default but should use the os_workers fact Change-Id: Id26f6c1c252121f543938305098d22f6510299e5
This commit is contained in:
parent
b31859d8ee
commit
5d8a4a86ed
@ -16,7 +16,7 @@
|
||||
#
|
||||
# [*workers*]
|
||||
# (optional) Number of worker processes.
|
||||
# Defaults to $::os_service_default
|
||||
# Defaults to $::os_workers
|
||||
#
|
||||
# [*manage_nova_flavor*]
|
||||
# (optional) Whether or not manage Nova flavor for the Amphora.
|
||||
@ -110,7 +110,7 @@ class octavia::worker (
|
||||
$manage_service = true,
|
||||
$enabled = true,
|
||||
$package_ensure = 'present',
|
||||
$workers = $::os_service_default,
|
||||
$workers = $::os_workers,
|
||||
$manage_nova_flavor = true,
|
||||
$nova_flavor_config = {},
|
||||
$key_path = '/etc/octavia/.ssh/octavia_ssh_key',
|
||||
|
@ -0,0 +1,4 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
The number of workers for octavia-worker now defaults to os_workers
|
@ -66,7 +66,7 @@ describe 'octavia::worker' do
|
||||
end
|
||||
|
||||
it 'configures worker parameters' do
|
||||
is_expected.to contain_octavia_config('controller_worker/workers').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_octavia_config('controller_worker/workers').with_value(4)
|
||||
is_expected.to contain_octavia_config('controller_worker/amp_flavor_id').with_value('65')
|
||||
is_expected.to contain_octavia_config('controller_worker/amphora_driver').with_value('amphora_haproxy_rest_driver')
|
||||
is_expected.to contain_octavia_config('controller_worker/compute_driver').with_value('compute_nova_driver')
|
||||
@ -186,7 +186,7 @@ describe 'octavia::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 => 4}))
|
||||
end
|
||||
let(:platform_params) do
|
||||
case facts[:osfamily]
|
||||
|
Loading…
Reference in New Issue
Block a user