From dfb41b94126b0d9381a2b50dabcf47e43c5432dc Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Fri, 6 May 2016 01:18:34 -0500 Subject: [PATCH] modified to include the new config for neutron-api to enable flat networking. Change-Id: Ie0411e28a4020812d5271683e4c155cc5fa5045d Signed-off-by: Narinder Gupta --- ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml | 1 + ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml | 3 ++- ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml | 2 +- ci/odl/juju-deployer/ovs-odl-ha.yaml | 2 +- ci/odl/juju-deployer/ovs-odl-nonha.yaml | 2 +- ci/odl/juju-deployer/ovs-odl-tip.yaml | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml index 8df30b26..49e0d667 100644 --- 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 41d218d4..888ddaec 100644 --- 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 a5b6cef8..3690d5a5 100644 --- 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 fab94767..b3b24f23 100644 --- 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 85e4cbfa..1d51668e 100644 --- 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 938953d2..8db0481e 100644 --- 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: -- 2.16.6