1、修改platform配置文件，删除proxy_topo_type 配置项，增加注释

2、更新v21.02内容
3、修改host文件，更新platform内容

10 files changed, 11 insertions, 51 deletions

diff --git a/install_config/group_vars/platform.yml b/install_config/group_vars/platform.yml
index 38e6f56..f8a2627 100644
--- a/install_config/group_vars/platform.yml
+++ b/install_config/group_vars/platform.yml
@@ -1,6 +1,8 @@
-#####0: in_server 1:in_atca 3: in_adc
+#note: mirror tarffic + server + pcap :capture_packet_type:0, traffic_attr_type: 0, runtime_env_type:0,network_topo_type:0 traffic_load_type:0
+
+#####0: in_server_tun 1:in_atca 3: in_adc
 ##### proxy_topo_type: type of sapp to tfe traffic transport topology (include: in_server_tun,in_atca, in_adc)
-proxy_topo_type: 0
+#proxy_topo_type: 0
 
 #####0: pcap; 1: drive(mrzcpd) 
 ##### capture_packet_type : type of the sapp capture packat from nic(include:pcap,drive(mrzcpd))
diff --git a/install_config/hosts b/install_config/hosts
index 0fe8b50..0a45efa 100644
--- a/install_config/hosts
+++ b/install_config/hosts
@@ -1,45 +1,3 @@
-###################
-#   For example   #
-###################
-#变量device_id根据设备序号设置即可
-#变量vvipv4_1、vvipv4_2、vvipv6_1、vvipv6_2为Allot相关配置，其他环境可不填或直接删除变量
-#
-#20.09版本新增APP部署
-#[app_global]
-#0.0.0.0
-
-#[server_as_tun_mode]
-#1.1.1.1 device_id=device_1
-#
-#[adc_mxn]
-#10.3.72.1
-#10.3.72.2
-#
-#[adc_mcn0]
-#10.3.73.1 device_id=device_1 vvipv4_1=10.3.61.1 vvipv4_2=10.3.62.1 vvipv6_1=fc00::61:1 vvipv6_2=fc00::62:1
-#10.3.73.2 device_id=device_2 vvipv4_1=10.3.61.2 vvipv4_2=10.3.62.2 vvipv6_1=fc00::61:2 vvipv6_2=fc00::62:2
-#
-#[adc_mcn1]
-#10.3.74.1 device_id=device_1
-#10.3.74.2 device_id=device_2
-#
-#[adc_mcn2]
-#10.3.75.1 device_id=device_1
-#10.3.75.2 device_id=device_2
-#
-#[adc_mcn3]
-#10.3.76.1 device_id=device_1
-#10.3.76.2 device_id=device_2
-
-#[app_global]
-#[server_as_tun_mode]
-#broken warning:
-#10.4.52.71
-[adc_mcn0]
-[adc_mcn1]
-[adc_mcn2]
-[adc_mcn3]
-[app_global]
-[server_as_tun_mode]
-
+[platform]
+#10.4.52.71 ip required and uncomment
 
diff --git a/roles/framework/files/libmaatframe-3.1.10.653727e-2.el7.x86_64.rpm b/roles/framework/files/libmaatframe-3.1.10.653727e-2.el7.x86_64.rpm
deleted file mode 100644
index 8c6b2e6..0000000
--- a/roles/framework/files/libmaatframe-3.1.10.653727e-2.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/framework/files/libmaatframe-3.1.11.593cb23-2.el7.x86_64.rpm b/roles/framework/files/libmaatframe-3.1.11.593cb23-2.el7.x86_64.rpm
new file mode 100644
index 0000000..142fad8
--- /dev/null
+++ b/roles/framework/files/libmaatframe-3.1.11.593cb23-2.el7.x86_64.rpm
diff --git a/roles/framework/tasks/main.yml b/roles/framework/tasks/main.yml
index 2735b5d..deacc4c 100644
--- a/roles/framework/tasks/main.yml
+++ b/roles/framework/tasks/main.yml
@@ -12,7 +12,7 @@
     packages:
       - /tmp/ansible_deploy/libcjson-1.7.10.ab2896f-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/libdocumentanalyze-2.0.6.2d1abe0-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libmaatframe-3.1.10.653727e-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/libmaatframe-3.1.11.593cb23-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/libMESA_field_stat-1.0.2.6d45eed-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/libMESA_field_stat2-2.9.10.72ac4f1-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/libMESA_handle_logger-2.0.7.cb4ad71-2.el7.x86_64.rpm
diff --git a/roles/sapp/files/sapp-4.2.25.893d15d-2.el7.x86_64.rpm b/roles/sapp/files/sapp-4.2.25.893d15d-2.el7.x86_64.rpm
deleted file mode 100644
index ca045ab..0000000
--- a/roles/sapp/files/sapp-4.2.25.893d15d-2.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/sapp/files/sapp-4.2.26.fc1a6aa-2.el7.x86_64.rpm b/roles/sapp/files/sapp-4.2.26.fc1a6aa-2.el7.x86_64.rpm
new file mode 100644
index 0000000..5d6b2ac
--- /dev/null
+++ b/roles/sapp/files/sapp-4.2.26.fc1a6aa-2.el7.x86_64.rpm
diff --git a/roles/sapp/tasks/main.yml b/roles/sapp/tasks/main.yml
index ac15ac3..a8a3acf 100644
--- a/roles/sapp/tasks/main.yml
+++ b/roles/sapp/tasks/main.yml
@@ -13,7 +13,7 @@
 - name: "install sapp rpms from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/sapp-4.2.25.893d15d-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/sapp-4.2.26.fc1a6aa-2.el7.x86_64.rpm
     state: present
  
 - name: "install tcpdump_mesa rpms from localhost"
diff --git a/roles/sapp/templates/sapp.service.j2 b/roles/sapp/templates/sapp.service.j2
index f463dc4..8c04042 100644
--- a/roles/sapp/templates/sapp.service.j2
+++ b/roles/sapp/templates/sapp.service.j2
@@ -1,6 +1,6 @@
 [Unit]
 Description=sapp service
-{% if proxy_topo_type != 0 %}
+{% if capture_packet_type == 1 %}
 Requires=mrzcpd.service
 After=mrzcpd.service
 {% endif %}
diff --git a/server_deploy.yml b/server_deploy.yml
index 548630b..594a9d8 100644
--- a/server_deploy.yml
+++ b/server_deploy.yml
@@ -1,7 +1,7 @@
-- hosts: server_as_tun_mode
+- hosts: platform
   remote_user: root
   vars_files:
-    - install_config/group_vars/server_as_tun_mode.yml
+    - install_config/group_vars/platform.yml
   roles:
     - {role: framework, tags: framework}
     - {role: kernel-ml, tags: kernel-ml}