Merge "remove the flat network type to support ODL."

diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 3273d0d..3680f28 100644 (file)
--- 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 269bf25..443b5d0 100644 (file)
--- 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 4bd4e1e..a720dc8 100644 (file)
--- 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: