summaryrefslogtreecommitdiffstats
path: root/roles/contiv/templates/netplugin.j2
diff options
context:
space:
mode:
authorNick Bartos <flamingo@2thebatcave.com>2017-12-19 11:45:23 +1100
committerNick Bartos <flamingo@2thebatcave.com>2018-01-08 07:44:35 +1100
commita6860728cf634fdcba82db9dd5b2a2d82e93eaca (patch)
treebfa095bf7b3da94936d703e3b1091efe986d24b8 /roles/contiv/templates/netplugin.j2
parent6daf71565fd69e9ddb2ac20e787d49f74cf7a9d7 (diff)
downloadopenshift-a6860728cf634fdcba82db9dd5b2a2d82e93eaca.tar.gz
openshift-a6860728cf634fdcba82db9dd5b2a2d82e93eaca.tar.bz2
openshift-a6860728cf634fdcba82db9dd5b2a2d82e93eaca.tar.xz
openshift-a6860728cf634fdcba82db9dd5b2a2d82e93eaca.zip
Use Contiv version 1.2.0
Diffstat (limited to 'roles/contiv/templates/netplugin.j2')
-rw-r--r--roles/contiv/templates/netplugin.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/contiv/templates/netplugin.j2 b/roles/contiv/templates/netplugin.j2
index 9ce44e2dc..0fd727401 100644
--- a/roles/contiv/templates/netplugin.j2
+++ b/roles/contiv/templates/netplugin.j2
@@ -1,6 +1,6 @@
{% if contiv_encap_mode == "vlan" %}
-NETPLUGIN_ARGS='-vlan-if {{ contiv_netplugin_interface }} -ctrl-ip {{ contiv_netplugin_ctrl_ip }} -plugin-mode kubernetes -cluster-store {{ contiv_etcd_url }}'
+NETPLUGIN_ARGS='--vlan-if={{ contiv_netplugin_interface }} --ctrl-ip={{ contiv_netplugin_ctrl_ip }} --etcd={{ contiv_etcd_url }} --fwdmode={{ contiv_netplugin_fwd_mode }} --cluster-mode=kubernetes --netmode={{ contiv_encap_mode }}'
{% endif %}
{% if contiv_encap_mode == "vxlan" %}
-NETPLUGIN_ARGS='-vtep-ip {{ contiv_netplugin_ctrl_ip }} -ctrl-ip {{ contiv_netplugin_ctrl_ip }} -plugin-mode kubernetes -cluster-store {{ contiv_etcd_url }}'
+NETPLUGIN_ARGS='--vtep-ip={{ contiv_netplugin_ctrl_ip }} --vxlan-port={{ contiv_vxlan_port }} --ctrl-ip={{ contiv_netplugin_ctrl_ip }} --etcd={{ contiv_etcd_url }} --fwdmode={{ contiv_netplugin_fwd_mode }} --cluster-mode=kubernetes --netmode={{ contiv_encap_mode }}'
{% endif %}