From: Tim Rozet <trozet@redhat.com>
Date: Tue, 19 Jan 2016 23:10:24 +0000 (-0500)
Subject: Fixes external br-ex mapping for L3 agent
X-Git-Tag: brahmaputra.1.rc1~8
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=df14e77ab9d9f082b75c644db189ce30a89ed891;p=apex.git

Fixes external br-ex mapping for L3 agent

We were accidentally setting the external default bridge to "" in
l3_agent.ini.  This was causing external router interfaces to be placed
on br-int instead of br-ex.  Note: this behavior changes in Mitaka

JIRA: APEX-61

Change-Id: Icbb2ba433a012d0e8771b7d82dec64464e526c7a
Signed-off-by: Tim Rozet <trozet@redhat.com>
---

diff --git a/build/network-environment.yaml b/build/network-environment.yaml
index ffe39c97..a95c27cc 100644
--- a/build/network-environment.yaml
+++ b/build/network-environment.yaml
@@ -30,7 +30,7 @@ resource_registry:
 
 
 parameter_defaults:
-  NeutronExternalNetworkBridge: "''"
+  #NeutronExternalNetworkBridge: "''"
   ControlPlaneSubnetCidr: "24"
   ControlPlaneDefaultRoute: 192.0.2.1
   ExternalNetCidr: 192.168.37.0/24