diff --git a/ansible/roles/traffic-engine/files/helm/conf/kni.conf b/ansible/roles/traffic-engine/files/helm/conf/kni.conf index e2c509bc..9f9c2d0c 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/kni.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/kni.conf @@ -2,7 +2,7 @@ log_path = ./log/kni/kni.log log_level = 30 tfe_node_count = 1 -manage_eth = {{ .Values.nic_policy_log_name }} +manage_eth = eth0 # deploy_mode: normal/tap deploy_mode = tap src_mac_addr = 00:0e:c6:d6:72:c1 diff --git a/ansible/roles/traffic-engine/files/helm/conf/main.conf b/ansible/roles/traffic-engine/files/helm/conf/main.conf index 03f74fad..8e3c5f4b 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/main.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/main.conf @@ -42,7 +42,6 @@ LOCATION_TABLE_TYPE=19 MODE=1 VSYSTEM_ID=1 NAMESPACE_ID=1 -NIC_NAME="{{ .Values.nic_policy_log_name }}" MAX_SERVICE=1 LOG_LEVEL=30 LOG_PATH="./tsglog/tsglog" @@ -66,7 +65,6 @@ OUTPUT_PATH="./tsg_stat.log" APP_NAME="tsg_master" [SYSTEM] -NIC_NAME="{{ .Values.nic_policy_log_name }}" DATACENTER_ID={{ .Values.session_id_generator.snowflake_worker_id_base }} LOG_LEVEL=30 LOG_PATH="./tsglog/tsg_master" diff --git a/ansible/roles/traffic-engine/files/helm/conf/tfe.conf b/ansible/roles/traffic-engine/files/helm/conf/tfe.conf index 303c14de..677b5f28 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/tfe.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/tfe.conf @@ -96,7 +96,6 @@ key_log_file=log/sslkeylog.log # mid cert cache mc_cache_enable=1 -mc_cache_eth={{ .Values.nic_policy_log_name }} mc_cache_broker_list={{- include "traffic-engine.config.olap-address" (list . ",") }} mc_cache_topic=PXY-EXCH-INTERMEDIA-CERT sasl_username={{ .Values.external_resources.olap.kafka_brokers.sasl_username }} @@ -172,7 +171,6 @@ default_vlan_id=0 [kafka] enable=1 -NIC_NAME={{ .Values.nic_policy_log_name }} kafka_brokerlist={{- include "traffic-engine.config.olap-address" (list . ",") }} kafka_topic=PROXY-EVENT sasl_username={{ .Values.external_resources.olap.kafka_brokers.sasl_username }} diff --git a/ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml b/ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml index 1332f517..7a10190a 100644 --- a/ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml +++ b/ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml @@ -34,6 +34,10 @@ spec: valueFrom: fieldRef: fieldPath: status.hostIP + - name: OVERRIDE_SLED_IP + valueFrom: + fieldRef: + fieldPath: status.hostIP securityContext: privileged: true livenessProbe: @@ -117,6 +121,10 @@ spec: valueFrom: fieldRef: fieldPath: status.hostIP + - name: OVERRIDE_SLED_IP + valueFrom: + fieldRef: + fieldPath: status.hostIP securityContext: privileged: true livenessProbe: