summaryrefslogtreecommitdiffstats
path: root/ci/bundle_tpl/neutron-api.yaml
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-07-07 07:55:37 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-07-07 11:26:48 -0500
commitf22e7ac163e30b07bb1582d55c40123ef23a735f (patch)
tree0223762bdbdcdb7de510ad3e5f539a0906764974 /ci/bundle_tpl/neutron-api.yaml
parent30e949d21abe6fb009feb2c2aa3111a85d5258c4 (diff)
tried to modify into single bundle. That is correct step to move
towards JUJU 2.0 Change-Id: I58e24aac2b5c23982a888bdc69830f95a9f79122 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/bundle_tpl/neutron-api.yaml')
-rw-r--r--ci/bundle_tpl/neutron-api.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/ci/bundle_tpl/neutron-api.yaml b/ci/bundle_tpl/neutron-api.yaml
index 86c6fedf..88990cb3 100644
--- a/ci/bundle_tpl/neutron-api.yaml
+++ b/ci/bundle_tpl/neutron-api.yaml
@@ -4,7 +4,8 @@
options:
neutron-security-groups: true
{% if os.network.controller == 'nosdn' %}
- overlay-network-type: vxlan
+ flat-network-providers: "*"
+ #overlay-network-type: gre vxlan
{% elif os.network.controller == 'odl' %}
manage-neutron-plugin-legacy-mode: False
{% elif os.network.controller == 'onos' %}