diff options
| author | fumingwei <[email protected]> | 2021-06-01 16:16:07 +0800 |
|---|---|---|
| committer | fumingwei <[email protected]> | 2021-06-01 16:16:07 +0800 |
| commit | f0637faf7a3c1e66cd28735ad99b75e2ad1ef1fc (patch) | |
| tree | 92b589fbe6f827ed190669a55cb45cb435fa7750 | |
| parent | 04b88b791fded3c13bb9a5b48b763fe23300dcfd (diff) | |
v21.05: 更新sapp
| -rw-r--r-- | install_config/group_vars/adc_global.yml | 4 | ||||
| -rw-r--r-- | roles/sapp/files/sapp-4.2.32.91bc8e3-2.el7.x86_64.rpm | bin | 488256 -> 0 bytes | |||
| -rw-r--r-- | roles/sapp/files/sapp-4.2.35.b0d7518-2.el7.x86_64.rpm | bin | 0 -> 491644 bytes | |||
| -rw-r--r-- | roles/sapp/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/sapp/templates/sapp.toml.j2 | 7 |
5 files changed, 8 insertions, 5 deletions
diff --git a/install_config/group_vars/adc_global.yml b/install_config/group_vars/adc_global.yml index 43a3a41..27e5177 100644 --- a/install_config/group_vars/adc_global.yml +++ b/install_config/group_vars/adc_global.yml @@ -1,7 +1,7 @@ ######################################### -#####1: Inline_device; 2: Allot; 3: ADC_Tun_mode; +#####0: pcap; 1: Inline_device; 2: Allot; 3: ADC_Tun_mode; 4:ATCA_Vlan_Flipping 5:ATCA_VXLAN tsg_access_type: 2 -#####2: ADC; +#####2: ADC; 0:Tun_mode; 1: normal; tsg_running_type: 2 #####deploy mode: cluster, single deploy_mode: "cluster" diff --git a/roles/sapp/files/sapp-4.2.32.91bc8e3-2.el7.x86_64.rpm b/roles/sapp/files/sapp-4.2.32.91bc8e3-2.el7.x86_64.rpm Binary files differdeleted file mode 100644 index 2b901d7..0000000 --- a/roles/sapp/files/sapp-4.2.32.91bc8e3-2.el7.x86_64.rpm +++ /dev/null diff --git a/roles/sapp/files/sapp-4.2.35.b0d7518-2.el7.x86_64.rpm b/roles/sapp/files/sapp-4.2.35.b0d7518-2.el7.x86_64.rpm Binary files differnew file mode 100644 index 0000000..a8ca743 --- /dev/null +++ b/roles/sapp/files/sapp-4.2.35.b0d7518-2.el7.x86_64.rpm diff --git a/roles/sapp/tasks/main.yml b/roles/sapp/tasks/main.yml index 9c2aabb..c250169 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.32.91bc8e3-2.el7.x86_64.rpm + - /tmp/ansible_deploy/sapp-4.2.35.b0d7518-2.el7.x86_64.rpm state: present - name: "install tcpdump_mesa rpms from localhost" diff --git a/roles/sapp/templates/sapp.toml.j2 b/roles/sapp/templates/sapp.toml.j2 index 445ceef..5fecc42 100644 --- a/roles/sapp/templates/sapp.toml.j2 +++ b/roles/sapp/templates/sapp.toml.j2 @@ -33,7 +33,7 @@ dictator_enable=0 l2_l3_tunnel_support=1 ### note, optional value is [none, vxlan] - {% if tsg_access_type == 5 %} + {% if tsg_access_type == 5 or tsg_access_type == 1 %} overlay_mode=vxlan {% else %} overlay_mode=none @@ -123,7 +123,10 @@ dictator_enable=0 reverse_ethernet_addr=1 [DUPLICATE_PKT] - duplicate_pkt_distinguish=0 + duplicate_pkt_distinguish=1 + bloom_capacity=1000000 + bloom_error_rate=0.00001 + bloom_timeout=10 [STREAM] ### note, stream_id_base_time format is "%Y-%m-%d %H:%M:%S" |