From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Thu, 16 Jun 2016 19:31:01 +0000 (-0500)
Subject: remove the flat network type to support ODL.
X-Git-Tag: colorado.1.0~126^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8c1aa9c2892d3c69a96a3da950a5f10ce8305d7f;p=joid.git

remove the flat network type to support ODL.

Change-Id: I7db1c33bf6bd66011edcddfb68d4856cb85c2255
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 3273d0d0..3680f285 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -348,7 +348,7 @@ openstack-phase2:
       num_units: 3
       options:
         neutron-security-groups: True
-        flat-network-providers: "*"
+        manage-neutron-plugin-legacy-mode: False
         vip: 10.4.1.17
         #os-public-hostname: api.public-fqdn
       to:
diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index 269bf250..443b5d08 100644
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -231,7 +231,7 @@ openstack-phase2:
       charm: local:trusty/neutron-api
       options:
         neutron-security-groups: True
-        flat-network-providers: "*"
+        manage-neutron-plugin-legacy-mode: False
       to:
         - "lxc:nodes=1"
     neutron-gateway:
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index 4bd4e1e5..a720dc8d 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -236,7 +236,7 @@ openstack-phase2:
       charm: local:trusty/neutron-api
       options:
         neutron-security-groups: True
-        flat-network-providers: "*"
+        manage-neutron-plugin-legacy-mode: False
       to:
         - "lxc:nodes=0"
     neutron-gateway: