diff options
Diffstat (limited to 'ci/odl')
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 11 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-nonha.yaml | 11 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 8 |
3 files changed, 27 insertions, 3 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 4c9c2c70..0c0e83c3 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -200,7 +200,7 @@ openstack-phase2: neutron-gateway: branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next options: -# ext-port: "eth1" + #ext-port: "eth1" plugin: ovs-odl instance-mtu: 1400 to: @@ -353,6 +353,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" @@ -373,6 +376,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" @@ -393,6 +399,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/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml index fcc5fb4c..81449d61 100644 --- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml @@ -137,7 +137,7 @@ openstack-phase2: neutron-gateway: branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next options: -# ext-port: "eth1" + #ext-port: "eth1" plugin: ovs-odl instance-mtu: 1400 to: @@ -271,6 +271,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" @@ -290,6 +293,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" @@ -309,6 +315,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/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 |