modified to include the new config for neutron-api to enable flat

networking.

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

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 8df30b2..49e0d66 100644 (file)
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -125,6 +125,7 @@ openstack-phase2:
       num_units: 3
       options:
         neutron-security-groups: true
+        flat-network-providers: *
         vip: 10.4.1.17
       to:
         - "lxc:nodes-api=2"

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index 41d218d..888ddae 100644 (file)
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -108,7 +108,8 @@ openstack-phase2:
       num_units: 1
       options:
         neutron-security-groups: true
-        overlay-network-type: vxlan
+        flat-network-providers: *
+#        overlay-network-type: vxlan
       to:
         - "lxc:nodes-api=0"
     neutron-gateway:

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index a5b6cef..3690d5a 100644 (file)
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -135,7 +135,7 @@ openstack-phase2:
       num_units: 1
       options:
         neutron-security-groups: True
-        manage-neutron-plugin-legacy-mode: False
+        flat-network-providers: *
       to:
         - "lxc:nodes-api=0"
     neutron-gateway:

diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index fab9476..b3b24f2 100644 (file)
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -207,7 +207,7 @@ openstack-phase2:
       num_units: 3
       options:
         neutron-security-groups: True
-        manage-neutron-plugin-legacy-mode: False
+        flat-network-providers: *
         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 85e4cbf..1d51668 100644 (file)
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -135,7 +135,7 @@ openstack-phase2:
       num_units: 1
       options:
         neutron-security-groups: True
-        manage-neutron-plugin-legacy-mode: False
+        flat-network-providers: *
       to: 
         - "lxc:nodes-api=0"
     neutron-gateway:

diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index 938953d..8db0481 100644 (file)
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -134,7 +134,7 @@ openstack-phase2:
       num_units: 1
       options:
         neutron-security-groups: True
-        manage-neutron-plugin-legacy-mode: False
+        flat-network-providers: *
       to:
         - "lxc:nodes-api=0"
     neutron-gateway: