From 0b3932ae2662d7927eb60e3c0b36258eb7d49755 Mon Sep 17 00:00:00 2001
From: Numan Siddique <nusiddiq@redhat.com>
Date: Mon, 13 Nov 2017 17:53:42 +0530
Subject: [PATCH] Use 'NeutronTenantNetwork' instead of 'NeutronApiNetwork' for
 ovn-encap-ip

ovn::controller:ovn-encap-ip is used by OVN Controllers as Geneve tunnel
end points. Presently this is configured with 'NeutronApiNetwork'. Since
the VM traffic is forwarded through the geneve end points, it makes more
sense to use 'NeutronTenantNetwork'. In the case of ML2OVS deployments,
'NeutronTenantNetwork' is used as VxLAN/GRE endpoints. Hence reusing the
same param.

Change-Id: I8b8d8c2bf20697cfb5df6a9cadadc965ae03bbb4
Closes-bug: #1731892
---
 puppet/services/ovn-controller.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/puppet/services/ovn-controller.yaml b/puppet/services/ovn-controller.yaml
index aa37627cdb..d8d53594b4 100644
--- a/puppet/services/ovn-controller.yaml
+++ b/puppet/services/ovn-controller.yaml
@@ -63,7 +63,7 @@ outputs:
       config_settings:
         ovn::southbound::port: {get_param: OVNSouthboundServerPort}
         ovn::controller::ovn_encap_type: {get_param: OVNTunnelEncapType}
-        ovn::controller::ovn_encap_ip: {get_param: [ServiceNetMap, NeutronApiNetwork]}
+        ovn::controller::ovn_encap_ip: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
         ovn::controller::ovn_bridge_mappings: {get_param: NeutronBridgeMappings}
         ovn::controller::ovn_bridge: {get_param: OVNIntegrationBridge}
         nova::compute::force_config_drive: true