summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml1
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml3
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml2
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml2
-rw-r--r--ci/odl/juju-deployer/ovs-odl-nonha.yaml2
-rw-r--r--ci/odl/juju-deployer/ovs-odl-tip.yaml2
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml15
7 files changed, 17 insertions, 10 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 1ce07c93..429bc9b4 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 1c2961ef..33b13008 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 44cb57a9..dd370877 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..3705200b 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..82c18beb 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..d5f3b16e 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:
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
index e740f58f..ac0f03d9 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
@@ -280,42 +280,47 @@ contrail:
services:
contrail-configuration:
branch: lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk
- num_units: 2
+ num_units: 3
options:
vip: 10.4.1.18
to:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
+ - "lxc:nodes-api=2"
contrail-control:
branch: lp:~sdn-charmers/charms/trusty/contrail-control/trunk
- num_units: 2
+ num_units: 3
to:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
+ - "lxc:nodes-api=2"
contrail-analytics:
branch: lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk
- num_units: 2
+ num_units: 3
to:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
+ - "lxc:nodes-api=2"
contrail-webui:
branch: lp:~sdn-charmers/charms/trusty/contrail-webui/trunk
- num_units: 2
+ num_units: 3
to:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
+ - "lxc:nodes-api=2"
neutron-api-contrail:
branch: lp:~opnfv-team/charms/trusty/neutron-api-contrail/trunk
neutron-contrail:
branch: lp:~opnfv-team/charms/trusty/neutron-contrail/trunk
haproxy:
branch: lp:~opnfv-team/charms/trusty/haproxy/trunk
- num_units: 2
+ num_units: 3
options:
peering_mode: active-active
to:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
+ - "lxc:nodes-api=2"
keepalived:
branch: lp:~sdn-charmers/charms/trusty/keepalived/trunk
options: