openstack
/
puppet-octavia
Code Issues Proposed changes

Merge "Accept array or hash for enable_provider_drivers" into stable/xena

This commit is contained in:
Zuul 2022-06-28 11:24:46 +00:00 committed by Gerrit Code Review
parent 861a235096 8da4abe08d
commit 3695102af0
3 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/api.pp
View File

@ -198,6 +198,12 @@ class octavia::api (
include octavia::db::sync
}
if $provider_drivers =~ Hash {
$provider_drivers_real = join(join_keys_to_values($provider_drivers, ':'), ',')
} else {
$provider_drivers_real = join(any2array($provider_drivers), ',')
}
octavia_config {
'api_settings/bind_host': value => $host;
'api_settings/bind_port': value => $port;
@ -207,7 +213,7 @@ class octavia::api (
'api_settings/api_v2_enabled': value => $api_v2_enabled;
'api_settings/allow_tls_terminated_listeners': value => $allow_tls_terminated_listeners;
'api_settings/default_provider_driver': value => $default_provider_driver;
'api_settings/enabled_provider_drivers': value => $provider_drivers;
'api_settings/enabled_provider_drivers': value => $provider_drivers_real;
'api_settings/pagination_max_limit': value => $pagination_max_limit;
'api_settings/healthcheck_enabled': value => $healthcheck_enabled;
'api_settings/healthcheck_refresh_interval': value => $healthcheck_refresh_interval;

6
releasenotes/notes/convert-provider_drivers-922ba756396e154c.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
The ``octavia::api::provider_drivers`` parameter now supports array or hash
value, and the given value is conveted to correctly formatted string when
being put into octavia.conf.

34
spec/classes/octavia_api_spec.rb
View File

@ -12,7 +12,7 @@ describe 'octavia::api' do
:api_v2_enabled => true,
:allow_tls_terminated_listeners => false,
:default_provider_driver => 'ovn',
:provider_drivers => { 'amphora' => 'Octavia Amphora Driver', 'ovn' => 'Octavia OVN driver' },
:provider_drivers => 'amphora:Octavia Amphora Driver,ovn:Octavia OVN driver',
:pagination_max_limit => '1000',
:healthcheck_enabled => true,
:healthcheck_refresh_interval => 5,
@ -76,7 +76,7 @@ describe 'octavia::api' do
end
end
it 'configures bind_host and bind_port' do
it 'configures parameters' do
is_expected.to contain_octavia_config('api_settings/bind_host').with_value( params[:host] )
is_expected.to contain_octavia_config('api_settings/bind_port').with_value( params[:port] )
is_expected.to contain_octavia_config('api_settings/api_handler').with_value( params[:api_handler] )
@ -182,6 +182,36 @@ describe 'octavia::api' do
.with_value('TLSv1')
end
end
context 'with provider_drivers in array' do
before do
params.merge!({
:provider_drivers => [
'amphora:Octavia Amphora driver',
'ovn:Octavia OVN driver'
]
})
end
it 'configures parameters' do
is_expected.to contain_octavia_config('api_settings/enabled_provider_drivers')\
.with_value('amphora:Octavia Amphora driver,ovn:Octavia OVN driver')
end
end
context 'with provider_drivers in hash' do
before do
params.merge!({
:provider_drivers => {
'amphora' => 'Octavia Amphora driver',
'ovn' => 'Octavia OVN driver'
}
})
end
it 'configures parameters' do
is_expected.to contain_octavia_config('api_settings/enabled_provider_drivers')\
.with_value('amphora:Octavia Amphora driver,ovn:Octavia OVN driver')
end
end
end
shared_examples 'octavia-api wsgi' do