summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-02-28 22:34:12 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2017-02-28 22:35:31 -0600
commit893a490ab1343e19adafc5ba6fa3d4711ec88d1c (patch)
tree26b8bb4d4116f206c73124ac8e553e410201d633 /ci
parent935769078463aa2d75979a1a212a32d71a10d498 (diff)
modfiied to include both vxlan and gre overlay providers. Also set
the defaukt tenant network providers to vxlan by default. Change-Id: Ic7bd872060575d0d83039cc3ff195a508179282a Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci')
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
index 72ad0bb9..d25a23e9 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
@@ -37,6 +37,9 @@
flat-network-providers: physnet1
{% if os.network.dvr %}
overlay-network-type: vxlan
+{% else %}
+ overlay-network-type: vxlan gre
+ default-tenant-network-type: vxlan
{% endif %}
{% elif os.network.controller == 'odl' %}
manage-neutron-plugin-legacy-mode: False