summaryrefslogtreecommitdiffstats
path: root/roles/contiv/templates
diff options
context:
space:
mode:
authorSanjeev Rampal <srampal@cisco.com>2017-05-26 14:27:09 -0700
committerSanjeev Rampal <srampal@cisco.com>2017-05-31 12:08:09 -0700
commit76d1ee25b7570add1531ba232c46977d7201a122 (patch)
treeb8a8f04ed6a440c115d037e476a17801f1554e14 /roles/contiv/templates
parentd175973070a4dce2055678f9309d2f74517d461e (diff)
downloadopenshift-76d1ee25b7570add1531ba232c46977d7201a122.tar.gz
openshift-76d1ee25b7570add1531ba232c46977d7201a122.tar.bz2
openshift-76d1ee25b7570add1531ba232c46977d7201a122.tar.xz
openshift-76d1ee25b7570add1531ba232c46977d7201a122.zip
Add support for rhel, aci, vxlan
Diffstat (limited to 'roles/contiv/templates')
-rw-r--r--roles/contiv/templates/netplugin.j24
1 files changed, 1 insertions, 3 deletions
diff --git a/roles/contiv/templates/netplugin.j2 b/roles/contiv/templates/netplugin.j2
index f3d26c037..a4928cc3d 100644
--- a/roles/contiv/templates/netplugin.j2
+++ b/roles/contiv/templates/netplugin.j2
@@ -1,9 +1,7 @@
{% if contiv_encap_mode == "vlan" %}
NETPLUGIN_ARGS='-vlan-if {{ netplugin_interface }} -ctrl-ip {{ netplugin_ctrl_ip }} -plugin-mode kubernetes -cluster-store etcd://{{ etcd_url }}'
{% endif %}
-{# Note: Commenting out vxlan encap mode support until it is fully supported
{% if contiv_encap_mode == "vxlan" %}
-NETPLUGIN_ARGS='-vtep-ip {{ netplugin_ctrl_ip }} -e {{contiv_encap_mode}} -ctrl-ip {{ netplugin_ctrl_ip }} -plugin-mode kubernetes -cluster-store etcd://{{ etcd_url }}'
+NETPLUGIN_ARGS='-vtep-ip {{ netplugin_ctrl_ip }} -ctrl-ip {{ netplugin_ctrl_ip }} -plugin-mode kubernetes -cluster-store etcd://{{ etcd_url }}'
{% endif %}
-#}