From 8014ae22350988ce7db7cbba7a7575d225316f59 Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Tue, 27 Apr 2021 10:48:52 +0200 Subject: [PATCH] Add OVNEncapType option to the ovn controller template Since OVN 2.13 it is possible to use vxlan encapsulation in the OVN tunnel networks. To do that, it has to be set in the external_ids:ovn-encap-type. There is support for that in the puppet-ovn module already. This patch adds missing TripleO-heat-template variable. Conflicts: deployment/ovn/ovn-controller-container-puppet.yaml Related-bz: #1881697 Change-Id: I54e617745e76f27a4c88156a9b1b17d0255ec837 (cherry picked from commit 1542df355bd22b83baaba1444fc58028046a5185) (cherry picked from commit b4cec5b729747c3c8cb607c6cd0f6e1821332f06) --- deployment/ovn/ovn-controller-container-puppet.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/deployment/ovn/ovn-controller-container-puppet.yaml b/deployment/ovn/ovn-controller-container-puppet.yaml index 15f378ef3d..aa029a8388 100644 --- a/deployment/ovn/ovn-controller-container-puppet.yaml +++ b/deployment/ovn/ovn-controller-container-puppet.yaml @@ -58,6 +58,13 @@ parameters: default: "datacentre:br-ex" tags: - role_specific + OVNEncapType: + description: > + Type of encapsulation used in OVN. It can be "geneve" or "vxlan". + type: string + default: "geneve" + constraints: + - allowed_values: ["geneve", "vxlan"] OVNIntegrationBridge: description: > Name of the OVS bridge to use as integration bridge by OVN Controller. @@ -159,6 +166,7 @@ outputs: "%{hiera('$NETWORK')}" params: $NETWORK: {get_param: [ServiceNetMap, NeutronTenantNetwork]} + ovn::controller::ovn_encap_type: {get_param: OVNEncapType} ovn::controller::ovn_bridge: {get_param: OVNIntegrationBridge} ovn::controller::hostname: "%{hiera('fqdn_canonical')}" ovn::controller::ovn_remote_probe_interval: {get_param: OVNRemoteProbeInterval}