From 6a5cab4bf2c06f76a3c6a05b40c7ad481ebd2773 Mon Sep 17 00:00:00 2001 From: Kamil Sambor Date: Mon, 7 Oct 2019 17:13:15 +0200 Subject: [PATCH] Add posibilities to configure OVNNorthboundServerPort in split stacks This changes is need by split stacks when ovn dbs are not colocated with neutron-server to configure correctly OVNNorthboundServerPort. When neutron api is deployed with ovn dbs on the same node, ovn dbs template set this port. But in other cases when they are not colocated we need to set this port in neutron plugin template. Change-Id: Ic84cc8864c799eaa4273c022b07445ec997a7fc9 Signed-off-by: Kamil Sambor (cherry picked from commit cacb8700d03bd182fb84fe6ab9a99c90aff209c2) (cherry picked from commit 4eed337552f030892aa837568c723e7130ae93f9) (cherry picked from commit 2a26c01b2270075e7450c3b750a7c79ab8d7f334) --- puppet/services/neutron-plugin-ml2-ovn.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/puppet/services/neutron-plugin-ml2-ovn.yaml b/puppet/services/neutron-plugin-ml2-ovn.yaml index cd8fb348fe..fa725b2d4b 100644 --- a/puppet/services/neutron-plugin-ml2-ovn.yaml +++ b/puppet/services/neutron-plugin-ml2-ovn.yaml @@ -34,6 +34,10 @@ parameters: description: Port of the OVN Southbound DB server type: number default: 6642 + OVNNorthboundServerPort: + description: Port of the OVN Northbound DB server + type: number + default: 6641 OVNDbConnectionTimeout: description: Timeout in seconds for the OVSDB connection transaction type: number @@ -107,6 +111,7 @@ outputs: map_merge: - get_attr: [NeutronMl2Base, role_data, config_settings] - ovn::southbound::port: {get_param: OVNSouthboundServerPort} + ovn::northbound::port: {get_param: OVNNorthboundServerPort} neutron::plugins::ml2::ovn::ovsdb_connection_timeout: {get_param: OVNDbConnectionTimeout} neutron::plugins::ml2::ovn::neutron_sync_mode: {get_param: OVNNeutronSyncMode} neutron::plugins::ml2::ovn::ovn_l3_mode: true