1、删除tsg_access_type 变量

2、新增proxy_topo_type，capture_pacakge_type,traffic_addr_type,network_topo_type,traffic_load_type,runtime_env_type
3、删除关于adc，atca的mrzcpd，sapp相关配置文件

roles/mrzcpd/tasks/main.yml

@@ -14,120 +14,21 @@
     src: "{{ role_path }}/templates/mrzcpd.j2"
     dest: /etc/sysconfig/mrzcpd
 
-- name: "update mrglobal.conf - traffic_mirror"
-  template:
-    src: "{{ role_path }}/templates/traffic_mirror/mrglobal.conf.traffic_mirror.j2"
-    dest: /opt/mrzcpd/etc/mrglobal.conf
-  when: nic_traffic_mirror is defined
-
-
-- name: "copy mrapp.sapp4.conf to destination server"
-  template:
-    src: "{{ role_path }}/templates/mrapp.sapp4.conf "
-    dest: /opt/mrzcpd/etc/mrapp.sapp4.conf 
-  when: 
-    - tsg_access_type == 4
-
-- name: "update mrglobal.conf.adc_inline"
-  template:
-    src: "{{ role_path }}/templates/adc_inline/mrglobal.conf.adc_inline.j2"
-    dest: /opt/mrzcpd/etc/mrglobal.conf
-  when: 
-    - nic_traffic_mirror is not defined
-    - tsg_access_type == 1
-    - tsg_running_type == 2
-
 - name: "update mrglobal.conf.server_inline"
   template:
     src: "{{ role_path }}/templates/server_inline/mrglobal.conf.server_inline.j2"
     dest: /opt/mrzcpd/etc/mrglobal.conf
   when: 
-    - nic_traffic_mirror is not defined
-    - tsg_access_type == 1
-    - tsg_running_type != 2
-
-- name: "update mrglobal.conf.allot - mcn0"
-  template:
-    src: "{{ role_path }}/templates/allot_access/mrglobal.conf.allot_access.j2"
-    dest: /opt/mrzcpd/etc/mrglobal.conf
-  when: 
-    - nic_traffic_mirror is not defined
-    - tsg_access_type == 2
-
-- name: "update mrglobal.conf.adc_tun_mode - mcn0"
-  template:
-    src: "{{ role_path }}/templates/adc_tun_mode/mrglobal.conf.adc_tun_mode.j2"
-    dest: /opt/mrzcpd/etc/mrglobal.conf
-  when: 
-    - nic_traffic_mirror is not defined
-    - tsg_access_type == 3
-
-
-- name: "update mrglobal.conf.ATCA_Vlan_Flipping"
-  template:
-    src: "{{ role_path }}/templates/ATCA_Vlan_Flipping/mrglobal.conf.ATCA_Vlan_Flipping.j2"
-    dest: /opt/mrzcpd/etc/mrglobal.conf
-  when: 
-    - nic_traffic_mirror is not defined
-    - tsg_access_type == 4
-
-- name: "update mrglobal.conf.ATCA_VXLAN"
-  template:
-    src: "{{ role_path }}/templates/ATCA_VXLAN/mrglobal.conf.ATCA_VXLAN.j2"
-    dest: /opt/mrzcpd/etc/mrglobal.conf
-  when:
-    - nic_traffic_mirror is not defined
-    - tsg_access_type == 5
-
-- name: "update mrtunnat.conf.adc_inline"
-  template:
-    src: "{{ role_path }}/templates/adc_inline/mrtunnat.conf.adc_inline.j2"
-    dest: /opt/mrzcpd/etc/mrtunnat.conf
-  when: 
-    - nic_traffic_mirror is not defined
-    - tsg_access_type == 1
-    - tsg_running_type == 2 
+    - runtime_env_type == 0
+    - capture_packet_type == 1
 
 - name: "update mrtunnat.conf.server_inline"
   template:
     src: "{{ role_path }}/templates/server_inline/mrtunnat.conf.server_inline.j2"
     dest: /opt/mrzcpd/etc/mrtunnat.conf
   when: 
-    - nic_traffic_mirror is not defined
-    - tsg_access_type == 1
-    - tsg_running_type != 2 
-
-- name: "update mrtunnat.conf.allot_access - mcn0"
-  template:
-    src: "{{ role_path }}/templates/allot_access/mrtunnat.conf.allot_access.j2"
-    dest: /opt/mrzcpd/etc/mrtunnat.conf
-  when: 
-    - nic_traffic_mirror is not defined
-    - tsg_access_type == 2
-
-- name: "update mrtunnat.conf.adc_tun_mode - mcn0"
-  template:
-    src: "{{ role_path }}/templates/adc_tun_mode/mrtunnat.conf.adc_tun_mode.j2"
-    dest: /opt/mrzcpd/etc/mrtunnat.conf
-  when: 
-    - nic_traffic_mirror is not defined
-    - tsg_access_type == 3
-
-- name: "update mrtunnat.conf.ATCA_Vlan_Flipping"
-  template:
-    src: "{{ role_path }}/templates/ATCA_Vlan_Flipping/mrtunnat.conf.ATCA_Vlan_Flipping.j2"
-    dest: /opt/mrzcpd/etc/mrtunnat.conf
-  when: 
-    - nic_traffic_mirror is not defined
-    - tsg_access_type == 4
-
-- name: "update mrtunnat.conf.ATCA_VXLAN"
-  template:
-    src: "{{ role_path }}/templates/ATCA_VXLAN/mrtunnat.conf.ATCA_VXLAN.j2"
-    dest: /opt/mrzcpd/etc/mrtunnat.conf
-  when:
-    - nic_traffic_mirror is not defined
-    - tsg_access_type == 5
+    - runtime_env_type == 0
+    - capture_packet_type == 1
 
 - name: "enable mrenv"
   systemd:
@@ -135,7 +36,7 @@
     enabled: yes
     daemon_reload: yes
   when: 
-    - tsg_access_type != 0
+    - capture_packet_type == 1
 
 - name: "enable mrzcpd"
   systemd:
@@ -143,7 +44,7 @@
     enabled: yes
     daemon_reload: yes
   when: 
-    - tsg_access_type != 0
+    - capture_packet_type == 1
 
 - name: "enable prometheus output - monit_device"
   systemd:
@@ -157,32 +58,16 @@
     enabled: yes
     daemon_reload: yes
 
-- name: "enable mrtunnat on master"
-  systemd:
-    name: mrtunnat
-    enabled: no
-    daemon_reload: yes
-  when: 
-    - nic_traffic_mirror is not defined
-    - tsg_access_type != 0
-
-- name: "disable mrtunnat on slave"
-  systemd:
-    name: mrtunnat
-    enabled: no
-    daemon_reload: yes
-  when: nic_traffic_mirror is defined
-
-- name: "mask mrzcpd on server_tun_mode"
+- name: "mask mrzcpd on capture_packet_type is pcap"
   systemd:
     name: mrzcpd
     enabled: no
     masked: yes
     daemon_reload: yes
   when: 
-    - tsg_access_type == 0
+    - capture_packet_type == 0
 
-- name: "mask mrtunnat on server_tun_mode"
+- name: "mask mrtunnat on capture_packet_type is pcap"
   systemd:
     name: mrtunnat
     enabled: no