From a2383edcf05976fdb8fa7cdf30fd1d38bd84c6a4 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Fri, 29 Dec 2023 16:19:37 +0800 Subject: [PATCH] =?UTF-8?q?feature:TSG-18248:=E5=88=A0=E9=99=A4hos=5Fserve?= =?UTF-8?q?r=E9=85=8D=E7=BD=AE=E9=A1=B9=E5=8F=8A=E5=85=B6=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/roles/tfe/tasks/main.yml | 8 +- .../roles/tfe/templates/pangu_pxy.conf.j2.j2 | 89 ------------------- .../files/helm/conf/pangu_pxy.conf | 85 ------------------ .../files/helm/templates/_config.tpl | 12 --- .../files/helm/templates/tfe.yaml | 1 - .../traffic-engine/files/helm/values.yaml | 6 -- .../provision.default.yml.7400MCN0P01R01 | 2 - .../provision.default.yml.7400MCN123P01R01 | 3 - .../tasks/provision.yml.7400MCN123P01R01 | 6 -- 9 files changed, 1 insertion(+), 211 deletions(-) delete mode 100644 ansible/roles/tfe/templates/pangu_pxy.conf.j2.j2 delete mode 100644 ansible/roles/traffic-engine/files/helm/conf/pangu_pxy.conf diff --git a/ansible/roles/tfe/tasks/main.yml b/ansible/roles/tfe/tasks/main.yml index c0b03c8a..50c09f7e 100644 --- a/ansible/roles/tfe/tasks/main.yml +++ b/ansible/roles/tfe/tasks/main.yml @@ -67,12 +67,6 @@ src: "{{ role_path }}/templates/future.conf.j2" dest: /opt/tsg/tfe/conf/tfe/future.conf -- name: "template the pangu_pxy.conf" - template: - src: "{{ role_path }}/templates/pangu_pxy.conf.j2.j2" - dest: /opt/tsg/tsg-os-provision/templates/pangu_pxy.conf.j2 - when: runtime_env != 'TSG-X-P0906' - - name: "create conf/doh/" file: path: /opt/tsg/tfe/conf/doh/ @@ -117,7 +111,7 @@ - /usr/lib/systemd/system/tfe.service when: runtime_env != 'TSG-X-P0906' -- name: "template the pangu_pxy.conf" +- name: "template the service_add_StartPostForRps.conf" template: src: "{{ role_path }}/templates/service_add_StartPostForRps.conf.j2.j2" dest: /opt/tsg/tsg-os-provision/templates/service_add_StartPostForRps.conf.j2 diff --git a/ansible/roles/tfe/templates/pangu_pxy.conf.j2.j2 b/ansible/roles/tfe/templates/pangu_pxy.conf.j2.j2 deleted file mode 100644 index 206a5ca3..00000000 --- a/ansible/roles/tfe/templates/pangu_pxy.conf.j2.j2 +++ /dev/null @@ -1,89 +0,0 @@ -[debug] -enable_plugin=1 - -[log] -# default 1, if enable "en_sendlog", the iterm "tfe.conf [kafka] enable" must set 1 -{% raw %}{% if proxy.enable_hos == 1 %} -en_hoslog=1 -{% endif %} -{% if proxy.enable_hos != 1 %} -en_hoslog=0 -{% endif %} -{% endraw %} -en_sendlog=1 -entrance_id=0 - -#Addresses of hos, Bucket name in hos. Format is defined by WiredLB. -{% raw %}cache_ip_list = {{ olap.hos_server.address }} -cache_listen_port = {{ olap.hos_server.port }} -cache_bucket_name=hos/proxy_hos_bucket -cache_token={{ olap.hos_server.token }} -{% endraw %} - -#Refer to the pangu_cahche definition -max_used_memroy_size_mb=5120 -cache_default_ttl_second=3600 -cache_object_key_hash_switch=1 - -cache_store_object_way=0 -redis_cache_object_size=1024000 - -#If CACHE_STORE_OBJECT_WAY is not 0, we will use redis to store meta and object. -redis_cluster_ip_list=192.168.10.62-63; -redis_cluster_port_range=6379 -#wired load balancer configuration - -#Configs of WiredLB for Minios load balancer. -wiredlb_override=1 -wiredlb_topic=MinioFileLog -wiredlb_datacenter=k18consul-tse -wiredlb_health_port=8560 -wiredlb_group=FileLog - -log_fsstat_appname=tango_log_file -log_fsstat_filepath=./tango_log_file.fs -log_fsstat_interval=10 -log_fsstat_trig=1 -log_fsstat_dst_ip=10.4.20.202 -log_fsstat_dst_port=8125 - - -[tango_cache] -enable_cache=0 -cache_ip_list=192.168.10.61-64; -cache_listen_port=9000 -cache_bucket_name=hos/proxy_hos_bucket -cache_token={% raw %}{{ olap.hos_server.token }} -{% endraw %} - -max_cnnt_pipeline_num=20 -#Maximum size of memory used by tango_cache_client. Upload will fail if the current size of memory used exceeds this value. -max_used_memory_size_mb=10240 -#Default TTL of objects, i.e. the time after which the object will expire(minumun 60s, i.e. 1 minute). -cache_default_ttl_second=3600 -#Whether to hash the object key before cache actions. GET/PUT may be faster if you open it. -cache_object_key_hash_switch=1 -#Store way: 0-HOS; 1-META in REDIS, object in hos; 2-META and small object in Redis, large object in hos; -cache_store_object_way=2 -#If CACHE_STORE_OBJECT_WAY is 2 and the size of a object is not bigger than this value, object will be stored in redis. -redis_cache_object_size=102400 -#If CACHE_STORE_OBJECT_WAY is not 0, we will use redis to store meta and object. -redis_cluster_ip_list=192.168.10.62-63; -redis_cluster_port_range=6379 - -#Configs of WiredLB for Minios load balancer.Refer to the definition at log - -cache_undefined_obj=1 -query_undefined_obj=0 -statsd_server=192.168.10.72 -statsd_port=8126 -histogram_bins=0.20,0.40,0.6,0.8 - -log_fsstat_appname=tango_cache -log_fsstat_filepath=./tango_cache_client.fs -log_fsstat_interval=10 -log_fsstat_trig=1 -log_fsstat_dst_ip=10.4.20.201 -log_fsstat_dst_port=8125 - - diff --git a/ansible/roles/traffic-engine/files/helm/conf/pangu_pxy.conf b/ansible/roles/traffic-engine/files/helm/conf/pangu_pxy.conf deleted file mode 100644 index b9c9d5ec..00000000 --- a/ansible/roles/traffic-engine/files/helm/conf/pangu_pxy.conf +++ /dev/null @@ -1,85 +0,0 @@ -[debug] -enable_plugin=1 - -[log] -# default 1, if enable "en_sendlog", the iterm "tfe.conf [kafka] enable" must set 1 -{{- if eq .Values.external_resources.olap.hos_servers.use .Values.define_enable_val_yes }} -en_hoslog=1 -{{- else }} -en_hoslog=0 -{{- end }} -en_sendlog=1 -entrance_id=0 - -#Addresses of hos, Bucket name in hos. Format is defined by WiredLB. -cache_ip_list = {{- include "traffic-engine.config.hos-address" . }} -cache_listen_port = {{- include "traffic-engine.config.hos-port" . }} -cache_bucket_name=hos/proxy_hos_bucket -cache_token={{ .Values.external_resources.olap.hos_servers.token }} - -#Refer to the pangu_cahche definition -max_used_memroy_size_mb=5120 -cache_default_ttl_second=3600 -cache_object_key_hash_switch=1 - -cache_store_object_way=0 -redis_cache_object_size=1024000 - -#If CACHE_STORE_OBJECT_WAY is not 0, we will use redis to store meta and object. -redis_cluster_ip_list=192.168.10.62-63; -redis_cluster_port_range=6379 -#wired load balancer configuration - -#Configs of WiredLB for Minios load balancer. -wiredlb_override=1 -wiredlb_topic=MinioFileLog -wiredlb_datacenter=k18consul-tse -wiredlb_health_port=8560 -wiredlb_group=FileLog - -log_fsstat_appname=tango_log_file -log_fsstat_filepath=./tango_log_file.fs -log_fsstat_interval=10 -log_fsstat_trig=1 -log_fsstat_dst_ip=10.4.20.202 -log_fsstat_dst_port=8125 - - -[tango_cache] -enable_cache=0 -cache_ip_list=192.168.10.61-64; -cache_listen_port=9000 -cache_bucket_name=hos/proxy_hos_bucket -cache_token={{ .Values.external_resources.olap.hos_servers.token }} - -max_cnnt_pipeline_num=20 -#Maximum size of memory used by tango_cache_client. Upload will fail if the current size of memory used exceeds this value. -max_used_memory_size_mb=10240 -#Default TTL of objects, i.e. the time after which the object will expire(minumun 60s, i.e. 1 minute). -cache_default_ttl_second=3600 -#Whether to hash the object key before cache actions. GET/PUT may be faster if you open it. -cache_object_key_hash_switch=1 -#Store way: 0-HOS; 1-META in REDIS, object in hos; 2-META and small object in Redis, large object in hos; -cache_store_object_way=2 -#If CACHE_STORE_OBJECT_WAY is 2 and the size of a object is not bigger than this value, object will be stored in redis. -redis_cache_object_size=102400 -#If CACHE_STORE_OBJECT_WAY is not 0, we will use redis to store meta and object. -redis_cluster_ip_list=192.168.10.62-63; -redis_cluster_port_range=6379 - -#Configs of WiredLB for Minios load balancer.Refer to the definition at log - -cache_undefined_obj=1 -query_undefined_obj=0 -statsd_server=192.168.10.72 -statsd_port=8126 -histogram_bins=0.20,0.40,0.6,0.8 - -log_fsstat_appname=tango_cache -log_fsstat_filepath=./tango_cache_client.fs -log_fsstat_interval=10 -log_fsstat_trig=1 -log_fsstat_dst_ip=10.4.20.201 -log_fsstat_dst_port=8125 - - diff --git a/ansible/roles/traffic-engine/files/helm/templates/_config.tpl b/ansible/roles/traffic-engine/files/helm/templates/_config.tpl index 408fa409..ea7941cb 100644 --- a/ansible/roles/traffic-engine/files/helm/templates/_config.tpl +++ b/ansible/roles/traffic-engine/files/helm/templates/_config.tpl @@ -103,17 +103,6 @@ enable_breakpad_upload=0 {{ join "," .Values.sapp_affinity }} {{- end -}} - -{{- define "traffic-engine.config.hos-address" -}} -{{- $address_dict := index .Values.external_resources.olap.hos_servers.addresses 0 -}} -{{- $address_dict.address }} -{{- end -}} - -{{- define "traffic-engine.config.hos-port" -}} -{{- $address_dict := index .Values.external_resources.olap.hos_servers.addresses 0 -}} -{{- $address_dict.port }} -{{- end -}} - {{- define "traffic-engine.config.identify-proto-name" -}} {{- $proto_name := "" -}} {{- $val_yes := .Values.define_enable_val_yes }} @@ -161,7 +150,6 @@ enable_breakpad_upload=0 {{- define "traffic-engine.proxy.copy-config-to-dest" -}} cp /opt/tsg/config/tfe.conf /opt/tsg/tfe/conf/tfe/tfe.conf - cp /opt/tsg/config/pangu_pxy.conf /opt/tsg/tfe/conf/pangu/pangu_pxy.conf cp /opt/tsg/config/tsg_device_tag.json /opt/tsg/etc/tsg_device_tag.json {{- end -}} diff --git a/ansible/roles/traffic-engine/files/helm/templates/tfe.yaml b/ansible/roles/traffic-engine/files/helm/templates/tfe.yaml index 0c555647..95740bef 100644 --- a/ansible/roles/traffic-engine/files/helm/templates/tfe.yaml +++ b/ansible/roles/traffic-engine/files/helm/templates/tfe.yaml @@ -6,6 +6,5 @@ metadata: data: {{- if and (eq .Values.proxy.enable .Values.define_enable_val_yes) (ge (len .Values.tfe_affinity) 1) }} tfe.conf: {{ tpl (.Files.Get "conf/tfe.conf") . | quote }} - pangu_pxy.conf: {{ tpl (.Files.Get "conf/pangu_pxy.conf") . | quote }} {{- end }} tsg_device_tag.json: {{ tpl (.Files.Get "conf/tsg_device_tag.json") . | quote }} diff --git a/ansible/roles/traffic-engine/files/helm/values.yaml b/ansible/roles/traffic-engine/files/helm/values.yaml index 174d17a3..4d1cb511 100644 --- a/ansible/roles/traffic-engine/files/helm/values.yaml +++ b/ansible/roles/traffic-engine/files/helm/values.yaml @@ -32,12 +32,6 @@ external_resources: addresses: - address: port: - hos_servers: - use: yes - addresses: - - address: - port: - token: nat_gateway: address: 10.0.X.X diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01 index 631dc028..37c21529 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01 @@ -4,13 +4,11 @@ feature: firewall: enable: 1 - enable_hos: 1 enable_dtls: 1 enable_sip: 1 proxy: enable: 1 - enable_hos: 1 sessionrecord: enable: 1 diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN123P01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN123P01R01 index e43f521b..c499bbb0 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN123P01R01 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN123P01R01 @@ -12,9 +12,6 @@ cm: db_static: 0 db_dynamic: 1 -proxy: - enable_hos: 1 - olap: hos_server: token: "c21f969b5f03d33d43e04f8f136e7682" diff --git a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN123P01R01 b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN123P01R01 index 1e701c69..e06e1c9d 100644 --- a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN123P01R01 +++ b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN123P01R01 @@ -76,12 +76,6 @@ src: "../templates/tfe.conf.j2" dest: /opt/tsg/tfe/conf/tfe/tfe.conf tags: tfe - - - name: "tsg-os-provision: template the pangu_pxy.conf" - template: - src: "../templates/pangu_pxy.conf.j2" - dest: /opt/tsg/tfe/conf/pangu/pangu_pxy.conf - tags: tfe - name: "tsg-os-provision: coredump setup override - mkdir" file: