From d66352978c52b6ee436507521fbd989547954fc3 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Tue, 2 Feb 2016 21:44:10 -0600 Subject: modified to enable the dvr option where compute nodes also has external connectivity. Change-Id: Ieff09f50204e15383ef3def5a0bf500689f5c317 (cherry picked from commit f394a823013d15b1fa9039aed1384e2fdafc37db) --- ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml | 11 ++++++++++- ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml | 11 ++++++++++- ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml | 8 +++++++- 3 files changed, 27 insertions(+), 3 deletions(-) (limited to 'ci/nosdn') diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml index 2df32d7f..cdcd0ffb 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml @@ -134,7 +134,7 @@ openstack-phase2: branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next" num_units: 1 options: -# ext-port: "eth1" + #ext-port: "eth1" instance-mtu: 1400 to: - "nodes-api=0" @@ -326,6 +326,9 @@ trusty-liberty: #os-data-network: 10.4.8.0/21 #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true + #enable-dvr: true + #l2-population: true + #ext-port: "eth1" region: Canonical source: "cloud:trusty-liberty" openstack-origin: "cloud:trusty-liberty" @@ -345,6 +348,9 @@ trusty-kilo: #os-data-network: 10.4.8.0/21 #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true + #enable-dvr: true + #l2-population: true + #ext-port: "eth1" region: Canonical source: "cloud:trusty-kilo" openstack-origin: "cloud:trusty-kilo" @@ -364,6 +370,9 @@ trusty-juno: #os-data-network: 10.4.8.0/21 #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true + #enable-dvr: true + #l2-population: true + #ext-port: "eth1" region: Canonical source: "cloud:trusty-juno" openstack-origin: "cloud:trusty-juno" diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml index 1d14b5b5..d64d0a4f 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml @@ -113,7 +113,7 @@ openstack-phase2: num_units: 1 options: instance-mtu: 1400 -# ext-port: "eth1" + #ext-port: "eth1" to: - "nodes-api=0" neutron-openvswitch: @@ -260,6 +260,9 @@ trusty-liberty: #os-data-network: 10.4.8.0/21 #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true + #enable-dvr: true + #l2-population: true + #ext-port: "eth1" region: Canonical source: "cloud:trusty-liberty" openstack-origin: "cloud:trusty-liberty" @@ -279,6 +282,9 @@ trusty-kilo: #os-data-network: 10.4.8.0/21 #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true + #enable-dvr: true + #l2-population: true + #ext-port: "eth1" region: Canonical source: "cloud:trusty-kilo" openstack-origin: "cloud:trusty-kilo" @@ -298,6 +304,9 @@ trusty-juno: #os-data-network: 10.4.8.0/21 #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true + #enable-dvr: true + #l2-population: true + #ext-port: "eth1" region: Canonical source: "cloud:trusty-juno" openstack-origin: "cloud:trusty-juno" diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml index 333ecb22..887c3941 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml @@ -139,7 +139,7 @@ openstack-phase2: options: openstack-origin-git: include-file://neutron-master.yaml instance-mtu: 1400 -# ext-port: "eth1" + #ext-port: "eth1" to: - "nodes-api=0" glance: @@ -256,6 +256,9 @@ trusty-liberty: #os-data-network: 10.4.8.0/21 #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true + #enable-dvr: true + #l2-population: true + #ext-port: "eth1" region: Canonical source: "cloud:trusty-liberty" openstack-origin: "cloud:trusty-liberty" @@ -278,6 +281,9 @@ trusty-kilo: #os-data-network: 10.4.8.0/21 #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true + #enable-dvr: true + #l2-population: true + #ext-port: "eth1" openstack-origin: cloud:trusty-kilo source: cloud:trusty-kilo series: trusty -- cgit 1.2.3-korg