summaryrefslogtreecommitdiffstats
path: root/ci/nosdn
diff options
context:
space:
mode:
Diffstat (limited to 'ci/nosdn')
-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
3 files changed, 4 insertions, 2 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 8df30b26..49e0d667 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 41d218d4..888ddaec 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 a5b6cef8..3690d5a5 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: