openstack
/
puppet-octavia
Code Issues Proposed changes

Add support for configuring ovn_nb_connection for ovn provider 

Change-Id: I46a8c379b389e72865dc386a259ac7edce912340
Partial-Bug: #1825146
(cherry picked from commit 9c3ddf4b95)
This commit is contained in:
Rabi Mishra 2019-04-18 09:57:03 +05:30
parent 7e11a90e8d
commit 1dfea84710
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/api.pp
View File

@ -63,6 +63,10 @@
# (optional) Configure the loadbalancer provider drivers.
# Defaults to $::os_service_default
#
# [*ovn_nb_connection*]
# (optional) The connection string for the OVN_Northbound OVSDB.
# Defaults to $::os_service_default
#
class octavia::api (
$enabled = true,
$manage_service = true,
@ -78,6 +82,7 @@ class octavia::api (
$sync_db = false,
$default_provider_driver = $::os_service_default,
$provider_drivers = $::os_service_default,
$ovn_nb_connection = $::os_service_default,
) inherits octavia::params {
include ::octavia::deps
@ -137,6 +142,6 @@ class octavia::api (
'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;
'ovn/ovn_nb_connection': value => $ovn_nb_connection;
}
}

4
releasenotes/notes/add-ovn-nb-connection-config-474ee0bdfa307fb6.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- Adds octavia::api::ovn_nb_connection to configure ovn nb connection string
for OVN Provider driver.

5
spec/classes/octavia_api_spec.rb
View File

@ -12,7 +12,8 @@ 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' },
:ovn_nb_connection => 'tcp:127.0.0.1:6641'
}
end
@ -53,6 +54,7 @@ describe 'octavia::api' do
is_expected.to contain_octavia_config('api_settings/allow_tls_terminated_listeners').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('api_settings/default_provider_driver').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('api_settings/enabled_provider_drivers').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('ovn/ovn_nb_connection').with_value('<SERVICE DEFAULT>')
end
it 'does not sync the database' do
is_expected.not_to contain_class('octavia::db::sync')
@ -68,6 +70,7 @@ describe 'octavia::api' do
is_expected.to contain_octavia_config('api_settings/allow_tls_terminated_listeners').with_value( params[:allow_tls_terminated_listeners] )
is_expected.to contain_octavia_config('api_settings/default_provider_driver').with_value( params[:default_provider_driver] )
is_expected.to contain_octavia_config('api_settings/enabled_provider_drivers').with_value( params[:provider_drivers] )
is_expected.to contain_octavia_config('ovn/ovn_nb_connection').with_value(params[:ovn_nb_connection])
end
[{:enabled => true}, {:enabled => false}].each do |param_hash|