diff options
author | Narinder Gupta <narinder.gupta@canonical.com> | 2016-02-02 21:44:10 -0600 |
---|---|---|
committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-02-05 13:32:11 +0000 |
commit | d66352978c52b6ee436507521fbd989547954fc3 (patch) | |
tree | 3e439d0815cbab9d0f4d135f74eda587a0d43783 /ci/odl/juju-deployer/ovs-odl-tip.yaml | |
parent | c94ed1d5ce17bc8ec8ae9c9d8051fd6ca975f94d (diff) |
modified to enable the dvr option where compute nodes also has
external connectivity.
Change-Id: Ieff09f50204e15383ef3def5a0bf500689f5c317
(cherry picked from commit f394a823013d15b1fa9039aed1384e2fdafc37db)
Diffstat (limited to 'ci/odl/juju-deployer/ovs-odl-tip.yaml')
-rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index 75411f53..eaea7770 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -138,7 +138,7 @@ openstack-phase2: branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next options: openstack-origin-git: include-file://neutron-master.yaml -# ext-port: "eth1" + #ext-port: "eth1" plugin: ovs-odl instance-mtu: 1400 to: @@ -274,6 +274,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" @@ -296,6 +299,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 |