summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xci/01-deploybundle.sh20
-rw-r--r--ci/bundles.yaml183
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml11
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml11
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml8
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml11
-rw-r--r--ci/odl/juju-deployer/ovs-odl-nonha.yaml11
-rw-r--r--ci/odl/juju-deployer/ovs-odl-tip.yaml8
-rw-r--r--ci/onos/juju-deployer/ovs-onos-ha.yaml2
-rw-r--r--ci/onos/juju-deployer/ovs-onos-nonha.yaml2
-rw-r--r--ci/onos/juju-deployer/ovs-onos-tip.yaml2
11 files changed, 181 insertions, 88 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index ef5f6594..2888b3a2 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -26,7 +26,7 @@ case "$3" in
# choose the correct interface to use for data network
sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 192.168.12.0\/24/g' ./bundles.yaml
# Choose the external port to go out from gateway to use.
- sed -i -- 's/# ext-port: "eth1"/ ext-port: "eth1"/g' ./bundles.yaml
+ sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
;;
'intelpod6' )
# As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
@@ -34,7 +34,7 @@ case "$3" in
# choose the correct interface to use for data network
sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml
# Choose the external port to go out from gateway to use.
- sed -i -- 's/# ext-port: "eth1"/ ext-port: "eth2"/g' ./bundles.yaml
+ sed -i -- 's/#ext-port: "eth1"/ext-port: "eth2"/g' ./bundles.yaml
;;
'intelpod5' )
# As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
@@ -42,29 +42,29 @@ case "$3" in
# choose the correct interface to use for data network
sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml
# Choose the external port to go out from gateway to use.
- sed -i -- 's/# ext-port: "eth1"/ ext-port: "eth2.724"/g' ./bundles.yaml
+ sed -i -- 's/#ext-port: "eth1"/ext-port: "eth2.724"/g' ./bundles.yaml
;;
'attvirpod1' )
# As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
sed -i -- 's/10.4.1.1/192.168.10.1/g' ./bundles.yaml
# Choose the external port to go out from gateway to use.
- sed -i -- 's/# ext-port: "eth1"/ ext-port: "eth1"/g' ./bundles.yaml
+ sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
;;
'cengnlynxpod1' )
sed -i -- 's/10.4.1.1/10.120.0.1/g' ./bundles.yaml
- sed -i -- 's/# ext-port: "eth1"/ ext-port: "eth2.1202"/g' ./bundles.yaml
+ sed -i -- 's/#ext-port: "eth1"/ext-port: "eth2.1202"/g' ./bundles.yaml
;;
'juniperpod1' )
sed -i -- 's/10.4.1.1/172.16.50.1/g' ./bundles.yaml
- sed -i -- 's/# ext-port: "eth1"/ ext-port: "eth1"/g' ./bundles.yaml
+ sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
;;
'custom' )
sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml
- sed -i -- 's/# ext-port: "eth1"/ ext-port: "eth1"/g' ./bundles.yaml
+ sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
;;
'default' )
sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml
- sed -i -- 's/# ext-port: "eth1"/ ext-port: "eth1"/g' ./bundles.yaml
+ sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
;;
esac
@@ -72,6 +72,10 @@ case "$5" in
'ipv6' )
sed -i -- 's/#prefer-ipv6: true/prefer-ipv6: true/g' ./bundles.yaml
;;
+ 'dvr' )
+ sed -i -- 's/#enable-dvr: true/enable-dvr: true/g' ./bundles.yaml
+ sed -i -- 's/#l2-population: true/l2-population: true/g' ./bundles.yaml
+ ;;
esac
echo "... Deployment Started ...."
diff --git a/ci/bundles.yaml b/ci/bundles.yaml
index 62d43bc0..81449d61 100644
--- a/ci/bundles.yaml
+++ b/ci/bundles.yaml
@@ -3,14 +3,14 @@ openstack-phase1:
series: trusty
services:
nodes-api:
- charm: "local:trusty/ubuntu-nodes-controller"
+ charm: "cs:trusty/ubuntu"
num_units: 1
constraints: tags=control
nodes-compute:
- charm: "local:trusty/ubuntu-nodes-compute"
+ charm: "cs:trusty/ubuntu"
num_units: 1
constraints: tags=compute
- "ntp":
+ ntp:
charm: "cs:trusty/ntp"
relations:
- - "ntp:juju-info"
@@ -20,22 +20,22 @@ openstack-phase1:
openstack-phase2:
inherits: openstack-phase1
services:
- "mysql":
- charm: "cs:trusty/mysql"
+ mysql:
+ branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
num_units: 1
options:
- "dataset-size": 2G
- "max-connections": 10000
+ dataset-size: 2G
+ max-connections: 10000
to:
- "lxc:nodes-api=0"
- "ceilometer":
+ ceilometer:
branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
num_units: 1
to:
- "lxc:nodes-api=0"
- "ceilometer-agent":
+ ceilometer-agent:
branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
- "mongodb":
+ mongodb:
charm: "cs:trusty/mongodb"
num_units: 1
to:
@@ -45,36 +45,35 @@ openstack-phase2:
to:
- "lxc:nodes-api=0"
ceph:
- charm: cs:trusty/ceph
+ branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
num_units: 1
options:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
- osd-devices: /srv
+ osd-devices: ""
monitor-count: 1
-# osd-reformat: 'yes'
+# osd-reformat: 'no'
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
to:
+ - "lxc:nodes-api=0"
+ ceph-osd:
+ branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
+ num_units: 1
+ options:
+ osd-devices: /srv
+ osd-reformat: 'yes'
+ to:
- "nodes-compute=0"
-# - "nodes-compute=1"
-# ceph-osd:
-# charm: cs:trusty/ceph-osd
-# num_units: 1
-# options:
-# osd-devices: /srv
-# osd-reformat: 'yes'
-# to:
-# - "nodes-compute=0"
-# ceph-radosgw:
-# charm: cs:trusty/ceph-radosgw
-# num_units: 1
-# options:
-# use-embedded-webserver: true
-# to:
-# - "lxc:nodes-api=0"
+ ceph-radosgw:
+ branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
+ num_units: 1
+ options:
+ use-embedded-webserver: true
+ to:
+ - "lxc:nodes-api=0"
cinder:
- charm: cs:trusty/cinder
+ branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
num_units: 1
options:
block-device: None
@@ -83,51 +82,51 @@ openstack-phase2:
to:
- "lxc:nodes-api=0"
cinder-ceph:
- charm: cs:trusty/cinder-ceph
- "rabbitmq-server":
- branch: lp:charms/trusty/rabbitmq-server
+ branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
+ rabbitmq-server:
+ branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next"
num_units: 1
to:
- "lxc:nodes-api=0"
- "keystone":
- branch: lp:charms/trusty/keystone
+ keystone:
+ branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
num_units: 1
options:
# ha-mcastport: 5402
- "admin-password": openstack
- "admin-token": admin
+ admin-password: openstack
+ admin-token: admin
to:
- "lxc:nodes-api=0"
- "openstack-dashboard":
- branch: lp:charms/trusty/openstack-dashboard
+ openstack-dashboard:
+ branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
num_units: 1
options:
secret: admin
webroot: /
to:
- "lxc:nodes-api=0"
- "nova-compute":
+ nova-compute:
branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
num_units: 1
options:
- "enable-live-migration": False
- "manage-neutron-plugin-legacy-mode": False
+ enable-live-migration: False
+ manage-neutron-plugin-legacy-mode: False
to:
- "nodes-compute=0"
# - "nodes-compute=1"
# - "nodes-api=0"
# - "nodes-api=1"
# - "nodes-api=2"
- "nova-cloud-controller":
- branch: lp:charms/trusty/nova-cloud-controller
+ nova-cloud-controller:
+ branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
num_units: 1
options:
- "console-access-protocol": novnc
- "network-manager": Neutron
- "quantum-security-groups": "yes"
+ console-access-protocol: novnc
+ network-manager: Neutron
+ quantum-security-groups: "yes"
to:
- "lxc:nodes-api=0"
- "neutron-api":
+ neutron-api:
branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
num_units: 1
options:
@@ -136,25 +135,51 @@ openstack-phase2:
to:
- "lxc:nodes-api=0"
neutron-gateway:
- branch: lp:charms/trusty/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:
- "nodes-api=0"
- "glance":
- branch: lp:charms/trusty/glance
+ odl-controller:
+ branch: lp:~openstack-charmers/charms/trusty/odl-controller/next
+ options:
+ #install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
+ install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distribution-karaf-0.3.3-Lithium-SR3.tar.gz"
+ profile: "openvswitch-odl-lithium"
+ http-proxy: "http://squid.internal:3128"
+ https-proxy: "http://squid.internal:3128"
+ to:
+ - "lxc:nodes-api=0"
+ glance:
+ branch: lp:~openstack-charmers/charms/trusty/glance/next
num_units: 1
to:
- "lxc:nodes-api=0"
- neutron-openvswitch:
- branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
+ opnfv-promise:
+ branch: lp:~narindergupta/charms/trusty/promise/trunk
+ num_units: 1
+ to:
+ - "lxc:nodes-api=0"
+ neutron-api-odl:
+ branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/next
+ options:
+ overlay-network-type: 'vxlan gre'
+ security-groups: True
+ openvswitch-odl:
+ branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk
relations:
- - - neutron-openvswitch:neutron-plugin-api
- - neutron-api:neutron-plugin-api
- - - nova-compute:neutron-plugin
- - neutron-openvswitch:neutron-plugin
- - - neutron-openvswitch:amqp
- - rabbitmq-server:amqp
+ - - "neutron-api:neutron-plugin-api-subordinate"
+ - "neutron-api-odl:neutron-plugin-api-subordinate"
+ - - "nova-compute:neutron-plugin"
+ - "openvswitch-odl:neutron-plugin"
+ - - "neutron-gateway"
+ - "openvswitch-odl"
+ - - "openvswitch-odl:ovsdb-manager"
+ - "odl-controller:ovsdb-manager"
+ - - "neutron-api-odl:odl-controller"
+ - "odl-controller:controller-api"
- - "keystone:shared-db"
- "mysql:shared-db"
- - "nova-cloud-controller:shared-db"
@@ -229,12 +254,12 @@ openstack-phase2:
- "cinder-ceph:ceph"
- - "ceph:client"
- "glance:ceph"
-# - - ceph-osd:mon
-# - ceph:osd
-# - - ceph-radosgw:mon
-# - ceph:radosgw
-# - - ceph-radosgw:identity-service
-# - keystone:identity-service
+ - - "ceph-osd:mon"
+ - "ceph:osd"
+ - - "ceph-radosgw:mon"
+ - "ceph:radosgw"
+ - - "ceph-radosgw:identity-service"
+ - "keystone:identity-service"
trusty-liberty-nodes:
inherits: openstack-phase1
overrides:
@@ -244,12 +269,18 @@ trusty-liberty:
inherits: openstack-phase2
overrides:
#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"
+ openstack-origin: "cloud:trusty-liberty"
series: trusty
ceph-osd-replication-count: 1
+ admin-role: admin
+ keystone-admin-role: admin
trusty-kilo-nodes:
inherits: openstack-phase1
@@ -260,13 +291,18 @@ trusty-kilo:
inherits: openstack-phase2
overrides:
#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"
+ openstack-origin: "cloud:trusty-kilo"
series: trusty
ceph-osd-replication-count: 1
-
+ admin-role: admin
+ keystone-admin-role: admin
trusty-juno-nodes:
inherits: openstack-phase1
@@ -277,11 +313,16 @@ trusty-juno:
inherits: openstack-phase2
overrides:
#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"
+ openstack-origin: "cloud:trusty-juno"
series: trusty
ceph-osd-replication-count: 1
-
+ admin-role: admin
+ keystone-admin-role: admin
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
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
diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml
index e495b377..fbbb09ea 100644
--- a/ci/onos/juju-deployer/ovs-onos-ha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml
@@ -201,7 +201,7 @@ openstack-phase2:
neutron-gateway:
branch: "lp:~wuwenbin2/onosfw/neutron-gateway"
options:
-# ext-port: "eth1"
+ #ext-port: "eth1"
plugin: onos
instance-mtu: 1400
to:
diff --git a/ci/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
index 8f0c8995..f8f6130c 100644
--- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
@@ -137,7 +137,7 @@ openstack-phase2:
neutron-gateway:
branch: "lp:~wuwenbin2/onosfw/neutron-gateway"
options:
-# ext-port: "eth1"
+ #ext-port: "eth1"
plugin: onos
instance-mtu: 1400
to:
diff --git a/ci/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml
index 32505f09..12e160dc 100644
--- a/ci/onos/juju-deployer/ovs-onos-tip.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml
@@ -138,7 +138,7 @@ openstack-phase2:
branch: "lp:~wuwenbin2/onosfw/neutron-gateway"
options:
openstack-origin-git: include-file://neutron-master.yaml
-# ext-port: "eth1"
+ #ext-port: "eth1"
plugin: onos
instance-mtu: 1400
to: