增加TUN与双臂模式的部署支持

roles/kni/tasks/main.yml

@@ -13,7 +13,7 @@
 - name: "install kni rpms from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/kni-2.1.0.b0bbde4-1.el7.centos.x86_64.rpm
+      - /tmp/ansible_deploy/kni-2.1.3.660d2c0-1.el7.centos.x86_64.rpm
     state: present
 
 - name: Template the sapp.toml
@@ -51,4 +51,3 @@
     name: sapp
     enabled: yes
     daemon_reload: yes
-

roles/kni/templates/kni.conf.j2

@@ -3,7 +3,11 @@ log_path = ./log/kni/kni.log
 log_level = {{ kni.global.log_level }}
 tfe_node_count = {{ kni.global.tfe_node_count }}
 manage_eth = {{ nic_mgr.name }}
+{% if run_as_tun_mode %}
+deploy_mode = tun
+{% else %}
 deploy_mode = normal
+{% endif %}
 tun_name = tun_kni
 src_mac_addr = 00:0e:c6:d6:72:c1
 dst_mac_addr = fe:65:b7:03:50:bd

roles/kni/templates/sapp.toml.j2

@@ -20,16 +20,30 @@ BSD_packet_filter=""
    
 ### note, depolyment.mode options: [mirror, inline, transparent]
     [packet_io.depolyment]
+    {% if nic_transparent_mode.enable %}
+    mode=transparent
+    {% else %}
     mode=inline
+    {% endif %}
 
 ### note, interface.type options: [pag,pcap,marsio]
     [packet_io.internal.interface]
+    {% if nic_transparent_mode.enable %}
+    type={{nic_transparent_mode.mode}}
+    name={{nic_transparent_mode.internel_interface}}
+    {% else %}
     type=marsio
     name=vxlan_user
+    {% endif %}
 
     [packet_io.external.interface]
+    {% if nic_transparent_mode.enable %}
+    type={{nic_transparent_mode.mode}}
+    name={{nic_transparent_mode.external_interface}}
+    {% else %}
     type=pcap
     name=lo
+    {% endif %}
 
     [packet_io.polling]
 ### note, polling_priority = call sapp_recv_pkt every call polling_entry times,