gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7400 adapt:修改tfe role用来适配tsg 7400

Browse Source
This commit is contained in:
fumingwei
2021-06-17 11:12:02 +08:00
parent f3874fc9ba
commit 77fa0df5fa
3 changed files with 57 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ansible/roles/tfe/templates/tfe-env-config.j2
View File

@@ -1,5 +1,15 @@
{% if PROFILE_ID == '9000-NPB-P01R01' %}
TFE_DEVICE_DATA_INCOMING=enp130s2f1
{% endif %}
{% if PROFILE_ID == '7400-MCN123-P01R01' %}
TFE_DEVICE_DATA_INCOMING=eth_pxy
{% endif %}
TFE_LOCAL_MAC_DATA_INCOMING=fe:65:b7:03:50:bd
{% if PROFILE_ID == '9000-NPB-P01R01' %}
TFE_PEER_MAC_DATA_INCOMING=00:0e:c6:d6:72:c1
{% endif %}
{% if PROFILE_ID == '7400-MCN123-P01R01' %}
TFE_PEER_MAC_DATA_INCOMING=aa:bb:cc:dd:ee:ff
{% endif %}
TFE_LOCAL_IP_DATA_INCOMING=172.16.241.2
TFE_PEER_IP_DATA_INCOMING=172.16.241.1

45
ansible/roles/tfe/templates/tfe.conf.j2.j2
View File

@@ -1,5 +1,10 @@
[system]
{% if PROFILE_ID == '9000-NPB-P01R01' %}
nr_worker_threads=26
{% endif %}
{% if PROFILE_ID == '7400-MCN123-P01R01' %}
nr_worker_threads=32
{% endif %}
enable_kni_v1=0
enable_kni_v2=0
enable_kni_v3=1
@@ -17,7 +22,12 @@ breakpad_minidump_dir=/run/tfe/crashreport
# ask for at least (1 + nr_worker_threads) masks
# the first mask for acceptor thread
# the others mask for worker thread
{% if PROFILE_ID == '9000-NPB-P01R01' %}
enable_cpu_affinity=1
{% endif %}
{% if PROFILE_ID == '7400-MCN123-P01R01' %}
enable_cpu_affinity=0
{% endif %}
cpu_affinity_mask=1-13,28-41
# LEAST_CONN = 0; ROUND_ROBIN = 1
@@ -38,7 +48,12 @@ queue_no_enobufs=1
# send cmsg
send_switch=1
{% if PROFILE_ID == '9000-NPB-P01R01' %}
ip=127.0.0.1
{% endif %}
{% if PROFILE_ID == '7400-MCN123-P01R01' %}
ip=192.168.100.1
{% endif %}
cmsg_port=2475
# watch dog
@@ -89,7 +104,12 @@ key_log_file=log/sslkeylog.log
# mid cert cache
mc_cache_enable=1
{% if PROFILE_ID == '9000-NPB-P01R01' %}
mc_cache_eth=enp130s2f3
{% endif %}
{% if PROFILE_ID == '7400-MCN123-P01R01' %}
mc_cache_eth=eth_ctl
{% endif %}
{% raw %}
mc_cache_broker_list={{ log_kafkabrokers.address | join(",") }}
{% endraw %}
@@ -102,7 +122,12 @@ ssl_ja3_table=PXY_SSL_FINGERPRINT
#0 on cache 1 off cache
no_cache=0
mode=normal
{% if PROFILE_ID == '9000-NPB-P01R01' %}
cert_store_host=127.0.0.1
{% endif %}
{% if PROFILE_ID == '7400-MCN123-P01R01'%}
cert_store_host=192.168.100.1
{% endif %}
cert_store_port=9991
ca_path=resource/tfe/tango-ca-v3-trust-ca.pem
untrusted_ca_path=resource/tfe/tango-ca-v3-untrust-ca.pem
@@ -152,8 +177,23 @@ statsd_set_prometheus_port=9001
statsd_set_prometheus_url_path=/metrics
[traffic_mirror]
{% if PROFILE_ID == '9000-NPB-P01R01' %}
enable=0
device=lo
type=0
{% endif %}
{% if PROFILE_ID == '7400-MCN123-P01R01' %}
enable=1
{% raw %}
{% if NPB_device == 'tera' %}
device=eth_mirr_d
type=1
{% else %}
device=lo
type=0
{% endif %}
{% endraw %}
{% endif %}
# 0:TRAFFIC_MIRROR_ETHDEV_AF_PACKET; 1:TRAFFIC_MIRROR_ETHDEV_MARSIO
type=0
table_info=resource/pangu/table_info_traffic_mirror.conf
@@ -161,7 +201,12 @@ stat_file=log/traffic_mirror.status
[kafka]
enable=1
{% if PROFILE_ID == '9000-NPB-P01R01' %}
NIC_NAME=enp130s2f3
{% endif %}
{% if PROFILE_ID == '7400-MCN123-P01R01' %}
NIC_NAME=eth_ctl
{% endif %}
{% raw %}
kafka_brokerlist={{ log_kafkabrokers.address | join(",") }}
{% endraw %}

3
ansible/tsg_7400_deploy.yml
View File

@@ -23,4 +23,5 @@
- {role: system-init, tags: system-init}
- {role: system-init-7400-mcn123, tags: system-init-7400-mcn123}
- {role: tsg_device_tag, tags: tsg_device_tag}
- {role: tsg_sn, tags: tsg_sn}
- {role: tsg_sn, tags: tsg_sn}
- {role: tfe, tags: tfe}