diff --git a/NurSultan_install_config/group_vars/adc_global.yml b/NurSultan_install_config/group_vars/adc_global.yml index 65b7a91..e3da52d 100644 --- a/NurSultan_install_config/group_vars/adc_global.yml +++ b/NurSultan_install_config/group_vars/adc_global.yml @@ -36,8 +36,8 @@ log_kafkabrokers: telegraf_kafkabrokers: address: "\"10.4.61.10:9092\",\"10.4.61.11:9092\",\"10.4.61.12:9092\",\"10.4.61.13:9092\",\"10.4.61.14:9092\",\"10.4.61.15:9092\",\"10.4.61.16:9092\",\"10.4.61.17:9092\",\"10.4.61.18:9092\",\"10.4.61.19:9092\",\"10.4.61.20:9092\"" -monitor_outputs_influxdb: - url: "http://127.0.0.1:58086" +#monitor_outputs_influxdb: +# url: "http://127.0.0.1:58086" log_minio: address: "10.4.62.253" @@ -93,9 +93,9 @@ kni: ######################################## #Tfe Config -tfe: - nr_threads: 32 - mirror_enable: 1 +#tfe: +# nr_threads: 32 +# mirror_enable: 1 ######################################## #Marsio Config diff --git a/group_vars/adc_global_general.yml b/group_vars/adc_global_general.yml index 16ae27b..b6e4519 100644 --- a/group_vars/adc_global_general.yml +++ b/group_vars/adc_global_general.yml @@ -77,15 +77,18 @@ kni: ######################################## #Tfe Config tfe: - nr_threads: 32 + nr_threads: 50 mirror_enable: 1 ######################################## #Marsio Config #marsio工作在ADC计算板时,建议使用如下配置,以保证更高的处理性能 -mrzcpd: +mcn0_mrzcpd: iocore: 52,53,54,55 +mcn123_mrzcpd: + iocore: 54,55 + mrtunnat: lcore_id: 48,49,50,51 diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml index 15dec34..a454316 100644 --- a/roles/firewall/tasks/main.yml +++ b/roles/firewall/tasks/main.yml @@ -56,5 +56,5 @@ template: src: "{{ role_path }}/templates/tsg_conn_sketch.inf.j2" dest: /home/mesasoft/sapp_run/plug/business/tsg_conn_sketch/tsg_conn_sketch.inf - tags: template tags: template + tags: template diff --git a/roles/mrzcpd/templates/adc_inline/mrglobal.conf.adc_inline.j2 b/roles/mrzcpd/templates/adc_inline/mrglobal.conf.adc_inline.j2 index af31df6..1f69435 100644 --- a/roles/mrzcpd/templates/adc_inline/mrglobal.conf.adc_inline.j2 +++ b/roles/mrzcpd/templates/adc_inline/mrglobal.conf.adc_inline.j2 @@ -32,7 +32,11 @@ promisc=1 [service] # lcore id for i/o service, use comma to split -iocore={{ mrzcpd.iocore }} +{% if bladename == "mcn0" %} +iocore={{ mcn0_mrzcpd.iocore }} +{% else %} +iocore={{ mcn123_mrzcpd.iocore }} +{% endif %} distmode=2 hashmode=0 diff --git a/roles/mrzcpd/templates/allot_access/mrglobal.conf.allot_access.j2 b/roles/mrzcpd/templates/allot_access/mrglobal.conf.allot_access.j2 index 038400e..30af697 100644 --- a/roles/mrzcpd/templates/allot_access/mrglobal.conf.allot_access.j2 +++ b/roles/mrzcpd/templates/allot_access/mrglobal.conf.allot_access.j2 @@ -33,7 +33,11 @@ promisc=1 [service] # lcore id for i/o service, use comma to split -iocore={{ mrzcpd.iocore }} +{% if bladename == "mcn0" %} +iocore={{ mcn0_mrzcpd.iocore }} +{% else %} +iocore={{ mcn123_mrzcpd.iocore }} +{% endif %} distmode=2 hashmode=0 diff --git a/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2 b/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2 index 94ff32b..a651d2a 100644 --- a/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2 +++ b/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2 @@ -30,6 +30,6 @@ ServiceAddress= ":8100" data_format = "influx" -[[outputs.influxdb]] - urls = ["{{ monitor_outputs_influxdb.url }}"] - database = "tsg_stat" +#[[outputs.influxdb]] +# urls = ["{{ monitor_outputs_influxdb.url }}"] +# database = "tsg_stat"