20.05.01

6 files changed, 6 insertions, 4 deletions

diff --git a/roles/tfe/files/tfe-4.3.2.374930d-1.el7.x86_64.rpm b/roles/tfe/files/tfe-4.3.2.374930d-1.el7.x86_64.rpm
deleted file mode 100755
index fbf2b90..0000000
--- a/roles/tfe/files/tfe-4.3.2.374930d-1.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/tfe/files/tfe-4.3.3.05c7528-1.el7.x86_64.rpm b/roles/tfe/files/tfe-4.3.3.05c7528-1.el7.x86_64.rpm
new file mode 100755
index 0000000..66bfb67
--- /dev/null
+++ b/roles/tfe/files/tfe-4.3.3.05c7528-1.el7.x86_64.rpm
diff --git a/roles/tfe/tasks/main.yml b/roles/tfe/tasks/main.yml
index 9b0552b..d78ef5f 100644
--- a/roles/tfe/tasks/main.yml
+++ b/roles/tfe/tasks/main.yml
@@ -8,7 +8,7 @@
   yum:
     name:
       - /tmp/ansible_deploy/tfe-kmod-v1.0.5.20200408-1dkms.noarch.rpm
-      - /tmp/ansible_deploy/tfe-4.3.2.374930d-1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tfe-4.3.3.05c7528-1.el7.x86_64.rpm
     state: present
 
 - name: "template tfe-env config"
diff --git a/roles/tfe/templates/pangu_pxy.conf.j2 b/roles/tfe/templates/pangu_pxy.conf.j2
index 35730c0..eb279b2 100644
--- a/roles/tfe/templates/pangu_pxy.conf.j2
+++ b/roles/tfe/templates/pangu_pxy.conf.j2
@@ -8,6 +8,7 @@ nic_name={{ tsg_tun_mode.ethname }}
 nic_name={{ nic_mgr.name }}

 {% endif %}

 entrance_id=0

+device_id_filepath=/opt/tsg/etc/tsg_sn.json

 kafka_brokerlist= {{ log_kafkabrokers.address }}

 kafka_topic=PROXY-EVENT-LOG

 

diff --git a/roles/tfe/templates/tfe-env-config.j2 b/roles/tfe/templates/tfe-env-config.j2
index edc4dd0..700742b 100644
--- a/roles/tfe/templates/tfe-env-config.j2
+++ b/roles/tfe/templates/tfe-env-config.j2
@@ -1,5 +1,5 @@
 {% if tsg_access_type == 0 %}
-TFE_DEVICE_DATA_INCOMING={{ tsg_tun_mode.tun_name }}
+TFE_DEVICE_DATA_INCOMING=tun_kni
 {% else %}
 TFE_DEVICE_DATA_INCOMING={{ nic_data_incoming.name }}
 {% endif %}
diff --git a/roles/tfe/templates/tfe.conf.j2 b/roles/tfe/templates/tfe.conf.j2
index b009909..5dfe34d 100644
--- a/roles/tfe/templates/tfe.conf.j2
+++ b/roles/tfe/templates/tfe.conf.j2
@@ -50,6 +50,7 @@ cert_store_host= {{ cert_store_server.address }}
 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
+enable_health_check=0
 
 [debug]	
 passthrough_all_tcp=0
@@ -78,11 +79,11 @@ tcp_ttl_upstream=75
 tcp_ttl_downstream=70
 
 [log]
-level=30
+level=10
 
 [stat]
 statsd_server={{ fs_remote.address }}
 statsd_port={{ fs_remote.port }}
 
 [http]
-loglevel=30
+loglevel=10