From 5d10c09630f67aa2b997223fe531270a8363c832 Mon Sep 17 00:00:00 2001 From: zhangzhihan Date: Wed, 15 Jan 2020 12:15:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9tfe.conf.j2=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=A4=E8=A1=8C=E5=8A=A8=E6=80=81=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc_inline_device_access/group_vars/all.yml | 2 ++ roles/tfe/templates/tfe.conf.j2 | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/adc_inline_device_access/group_vars/all.yml b/adc_inline_device_access/group_vars/all.yml index 86c83d7..f3ffcc0 100644 --- a/adc_inline_device_access/group_vars/all.yml +++ b/adc_inline_device_access/group_vars/all.yml @@ -60,6 +60,8 @@ kni: enabled: 1 tfe: nr_threads: 16 + kni_ip: 192.168.100.1 + mc_cache_eth: ens1.100 keykeeper: mode: "normal" no_cache: 0 diff --git a/roles/tfe/templates/tfe.conf.j2 b/roles/tfe/templates/tfe.conf.j2 index 4287107..08fa194 100644 --- a/roles/tfe/templates/tfe.conf.j2 +++ b/roles/tfe/templates/tfe.conf.j2 @@ -6,7 +6,7 @@ breakpad_minidump_dir=/run/tfe/crashreport/ breakpad_upload_url=http://127.0.0.1:9000/ [kni] -ip=192.168.100.1 +ip={{ tfe.kni_ip }} scm_port=2475 watchdog_switch=1 watchdog_port=2476 @@ -30,7 +30,7 @@ service_cache_expire_seconds=600 # default 0 mc_cache_enable=1 # default eth0 -mc_cache_eth=ens1.100 +mc_cache_eth={{ tfe.mc_cache_eth }} # default NULL mc_cache_broker_list={{ log_kafkabrokers.address }} # default PXY-EXCH-INTERMEDIA-CERT @@ -46,7 +46,7 @@ cert_store_port= {{ cert_store_server.port }} ca_path=resource/tfe/tango-ca-v3-trust-ca.pem untrusted_ca_path=resource/tfe/tango-ca-v3-untrust-ca.pem -[debug] +[debug] passthrough_all_tcp=0 [traffic_mirror]