diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-18 22:21:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-18 22:21:48 -0400 |
| commit | 865b3511d3df6fa5d938dda72e9d748c6c615c76 (patch) | |
| tree | d28a590c30f208d9436e5aee3802dd4ea259e94a /roles/contiv/templates/netplugin.j2 | |
| parent | 9545204f504f1dcf3de18272dc1fb951dd15f486 (diff) | |
| parent | 76d1ee25b7570add1531ba232c46977d7201a122 (diff) | |
| download | openshift-865b3511d3df6fa5d938dda72e9d748c6c615c76.tar.gz openshift-865b3511d3df6fa5d938dda72e9d748c6c615c76.tar.bz2 openshift-865b3511d3df6fa5d938dda72e9d748c6c615c76.tar.xz openshift-865b3511d3df6fa5d938dda72e9d748c6c615c76.zip | |
Merge pull request #4329 from srampal/rhel_ose_aci
Merged by openshift-bot
Diffstat (limited to 'roles/contiv/templates/netplugin.j2')
| -rw-r--r-- | roles/contiv/templates/netplugin.j2 | 4 |
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 %} -#} |