TSG-9180 Proxy支持Traffic Mirroring Profiles

2021-12-26 16:05:45 +08:00
parent 5577ce71b4
commit 3c48e91d9d
5 changed files with 2 additions and 6 deletions
--- a/ansible/install_config/group_vars/HAL_7400MCN123P01R01.yml
+++ b/ansible/install_config/group_vars/HAL_7400MCN123P01R01.yml
@@ -31,7 +31,6 @@ dp_proxy:
  mac_addr_data_incoming: aa:bb:cc:dd:ee:ff
  enable_traffic_mirror: 1
  traffic_mirror_type: 1
-  traffic_mirror_vlan_id: 0

 dp_certstore:
  location: local
--- a/ansible/install_config/group_vars/HAL_9000NPBP01R01.yml
+++ b/ansible/install_config/group_vars/HAL_9000NPBP01R01.yml
@@ -48,7 +48,6 @@ dp_proxy:
  mac_addr_data_incoming: 00:0e:c6:d6:72:c1
  enable_traffic_mirror: 1
  traffic_mirror_type: 1
-  traffic_mirror_vlan_id: 1025

 dp_certstore:
  location: local
--- a/ansible/install_config/group_vars/HAL_SERVER.yml
+++ b/ansible/install_config/group_vars/HAL_SERVER.yml
@@ -49,7 +49,6 @@ dp_proxy:
  mac_addr_data_incoming: 00:0e:c6:d6:72:c1
  enable_traffic_mirror: 1
  traffic_mirror_type: 1
-  traffic_mirror_vlan_id: 1025

 dp_certstore:
  location: local
--- a/ansible/install_config/group_vars/rpm_version.yml
+++ b/ansible/install_config/group_vars/rpm_version.yml
@@ -61,8 +61,8 @@ sapp_rpm_version:
  sapp-pr: sapp-pr-4.2.71.153e167

 tfe_rpm_version:
-  tfe: tfe-4.5.30.d201968
-  tfe-pr: tfe-pr-4.5.30.d201968
+  tfe: tfe-4.5.31.aae7383
+  tfe-pr: tfe-pr-4.5.31.aae7383

 tsg_app_rpm_version:
  app_sketch_local: app_sketch_local-4.3.1.6038e0a
--- a/ansible/roles/tfe/templates/tfe.conf.j2.j2
+++ b/ansible/roles/tfe/templates/tfe.conf.j2.j2
@@ -198,7 +198,6 @@ enable={{ dp_proxy.enable_traffic_mirror }}
 device={{ dp_traffic_mirror.nic_name }}
 # 0:TRAFFIC_MIRROR_ETHDEV_AF_PACKET; 1:TRAFFIC_MIRROR_ETHDEV_MARSIO
 type={{ dp_proxy.traffic_mirror_type }}
-default_vlan_id_for_mac={{ dp_proxy.traffic_mirror_vlan_id }}

 table_info=resource/pangu/table_info_traffic_mirror.conf
 stat_file=log/traffic_mirror.status