From 893a490ab1343e19adafc5ba6fa3d4711ec88d1c Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Tue, 28 Feb 2017 22:34:12 -0600
Subject: 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>
---
ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml | 3 +++
1 file changed, 3 insertions(+)
(limited to 'ci/config_tpl')
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
--
cgit