tsgv20.05更新

6 files changed, 9 insertions, 10 deletions

diff --git a/roles/sapp/files/sapp-4.0.12.f8435d8-x86_64.rpm b/roles/sapp/files/sapp-4.0.12.f8435d8-x86_64.rpm
new file mode 100644
index 0000000..aad4d1e
--- /dev/null
+++ b/roles/sapp/files/sapp-4.0.12.f8435d8-x86_64.rpm
diff --git a/roles/sapp/files/sapp-4.0.8.fb5bce9-1.el7.x86_64.rpm b/roles/sapp/files/sapp-4.0.8.fb5bce9-1.el7.x86_64.rpm
deleted file mode 100644
index 712cb9d..0000000
--- a/roles/sapp/files/sapp-4.0.8.fb5bce9-1.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/sapp/files/tsg_master-1.0.6.7c22c8d-2.el7.x86_64.rpm b/roles/sapp/files/tsg_master-1.0.6.7c22c8d-2.el7.x86_64.rpm
new file mode 100644
index 0000000..27d8e69
--- /dev/null
+++ b/roles/sapp/files/tsg_master-1.0.6.7c22c8d-2.el7.x86_64.rpm
diff --git a/roles/sapp/files/tsg_master-debug-1.0.0.-1.el7.x86_64.rpm b/roles/sapp/files/tsg_master-debug-1.0.0.-1.el7.x86_64.rpm
deleted file mode 100644
index 9d334b7..0000000
--- a/roles/sapp/files/tsg_master-debug-1.0.0.-1.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/sapp/tasks/main.yml b/roles/sapp/tasks/main.yml
index a5d19f2..edbdf8c 100644
--- a/roles/sapp/tasks/main.yml
+++ b/roles/sapp/tasks/main.yml
@@ -7,8 +7,7 @@
 - name: "install sapp rpms from localhost"
   yum:
     name:
-    #  - /tmp/ansible_deploy/sapp-4.0.11.347f7b7-x86_64.rpm
-      - /tmp/ansible_deploy/tsg_master-debug-1.0.0.-1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tsg_master-1.0.6.7c22c8d-2.el7.x86_64.rpm
     state: present
 
 - name: "judge sapp"
@@ -17,7 +16,7 @@
   ignore_errors: true
 
 - name: "install sapp rpms from localhost"
-  shell: cd /tmp/ansible_deploy;rpm -ivh sapp-4.0.8.fb5bce9-1.el7.x86_64.rpm
+  shell: cd /tmp/ansible_deploy;rpm -ivh sapp-4.0.12.f8435d8-x86_64.rpm
   when: return.rc != 0
 
 - name: make dir
diff --git a/roles/sapp/templates/sapp.toml.j2 b/roles/sapp/templates/sapp.toml.j2
index b65494d..028ad13 100644
--- a/roles/sapp/templates/sapp.toml.j2
+++ b/roles/sapp/templates/sapp.toml.j2
@@ -27,7 +27,7 @@ BSD_packet_filter=""
    
 ### note, depolyment.mode options: [mirror, inline, transparent]
     [packet_io.depolyment]
-    {% if nic_transparent_mode.enable == 1 %}
+    {% if tsg_access_type == 0 %}
     mode=transparent
     {% else %}
     mode=inline
@@ -35,18 +35,18 @@ BSD_packet_filter=""
 
 ### note, interface.type options: [pag,pcap,marsio]
     [packet_io.internal.interface]
-    {% if nic_transparent_mode.enable == 1 %}
-    type={{nic_transparent_mode.mode}}
-    name={{nic_transparent_mode.internel_interface}}
+    {% if tsg_access_type == 0 %}
+    type=pcap
+    name={{tsg_tun_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}}
+    {% if tsg_access_type == 0 %}
+    type=pcap
+    name={{tsg_tun_mode.external_interface}}
     {% else %}
     type=pcap
     name=lo