From d27c041534f121ae823f9145fd2a0a415e039313 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Mon, 19 Jun 2017 19:07:42 -0500
Subject: [PATCH] Neutron: fix mvp values.

This PS fixes the MVP values file to permit VM's to both be accessed
and access external networks.

Change-Id: If2243e55747c771ecd5fd9e2f4fb683899aa6623
---
 tools/overrides/mvp/neutron.yaml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/tools/overrides/mvp/neutron.yaml b/tools/overrides/mvp/neutron.yaml
index 8b043f4654..ccfc5b308a 100644
--- a/tools/overrides/mvp/neutron.yaml
+++ b/tools/overrides/mvp/neutron.yaml
@@ -18,19 +18,9 @@
 # kept to the bare minimum required for this purpose.
 
 network:
-  external_bridge: br-ex
   interface:
-    external: docker0
-    default: docker0
     tunnel: docker0
 
-ml2:
-  ovs:
-    auto_bridge_add:
-      br-physnet1: docker0
-    bridge_mappings:
-      - "physnet1:br-physnet1"
-
 conf:
   neutron:
     default:
@@ -44,6 +34,11 @@ conf:
           max_l3_agents_per_router: 1
           l3_ha_network_type: vxlan
           dhcp_agents_per_network: 1
+  ml2_conf:
+    ml2_type_flat:
+      neutron:
+        ml2:
+          flat_networks: public
   openvswitch_agent:
     agent:
       neutron:
@@ -58,3 +53,4 @@ conf:
             agent:
               of_interface: ovs-ofctl
               ovsdb_interface: vsctl
+              bridge_mappings: public:br-ex