gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature:TSG-12081:修改7400和9140环境下hos token由provision提供

Browse Source
This commit is contained in:
fumingwei
2022-09-23 16:18:02 +08:00
parent 5f3926db84
commit 572243ba66
14 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/firewall/templates/main.conf.j2.j2
View File

@@ -119,7 +119,7 @@ sendlog_in_tcp_close=1
{% if firewall.enable_hos == 1 %}
hos_serverip="{{ olap.hos_server.address }}"
hos_serverport={{ olap.hos_server.port }}
hos_token="c21f969b5f03d33d43e04f8f136e7682"
hos_token="{{ olap.hos_server.token }}"
hos_log_level=30
hos_each_upload_cache_size=1500
hos_each_upload_cache_count=10

7
ansible/roles/tfe/templates/pangu_pxy.conf.j2.j2
View File

@@ -16,9 +16,9 @@ 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 }}
{% endraw %}
cache_bucket_name=hos/proxy_hos_bucket
cache_token=c21f969b5f03d33d43e04f8f136e7682
cache_token={{ olap.hos_server.token }}
{% endraw %}
#Refer to the pangu_cahche definition
max_used_memroy_size_mb=5120
@@ -62,7 +62,8 @@ enable_cache=0
cache_ip_list=192.168.10.61-64;
cache_listen_port=9000
cache_bucket_name=hos/proxy_hos_bucket
cache_token=c21f969b5f03d33d43e04f8f136e7682
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.

2
ansible/roles/traffic-engine/files/helm/conf/pangu_pxy.conf
View File

@@ -57,7 +57,7 @@ enable_cache=0
cache_ip_list=192.168.10.61-64;
cache_listen_port=9000
cache_bucket_name=hos/proxy_hos_bucket
cache_token=c21f969b5f03d33d43e04f8f136e7682
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.

6
ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01
View File

@@ -75,4 +75,8 @@ cm:
#####session_distribution_policy.hash_key in [outer-most-sip-dip,outer-most-sip-dip-sport-dport,inner-most-sip-dip,inner-most-sip-dip-sport-dport]
session_distribution_policy:
mode: sym-hash
hash_key: inner-most-sip-dip
hash_key: inner-most-sip-dip
olap:
hos_server:
token: "c21f969b5f03d33d43e04f8f136e7682"

6
ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN123P01R01
View File

@@ -13,4 +13,8 @@ cm:
db_dynamic: 1
proxy:
enable_hos: 1
enable_hos: 1
olap:
hos_server:
token: "c21f969b5f03d33d43e04f8f136e7682"

4
ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01
View File

@@ -75,3 +75,7 @@ cm:
session_distribution_policy:
mode: sym-hash
hash_key: inner-most-sip-dip
olap:
hos_server:
token: "c21f969b5f03d33d43e04f8f136e7682"

6
ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P0804
View File

@@ -83,4 +83,8 @@ cpu_layouts:
sockets: 2
sapp_affinity: [5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76]
mrzcpd_affinity: [1,2,3,4]
tfe_affinity: [77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92]
tfe_affinity: [77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92]
olap:
hos_server:
token: "c21f969b5f03d33d43e04f8f136e7682"

6
ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P1403
View File

@@ -82,4 +82,8 @@ cpu_layouts:
model_name: "5318Y"
sockets: 2
sapp_affinity: [5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92]
mrzcpd_affinity: [1,2,3,4]
mrzcpd_affinity: [1,2,3,4]
olap:
hos_server:
token: "c21f969b5f03d33d43e04f8f136e7682"

1
ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01
View File

@@ -60,6 +60,7 @@ olap:
hos_server:
address: "127.0.0.1"
port: 9098
token: "xxxxxxxxxx"
# npb_device value in [inline_device, tera,direct]
npb_device: inline_device

1
ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN123P01R01
View File

@@ -19,6 +19,7 @@ olap:
hos_server:
address: "127.0.0.1"
port: 9098
token: "xxxxxxxxxx"
network_setting:
nic_policy_log:

1
ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01
View File

@@ -59,6 +59,7 @@ olap:
hos_server:
address: "127.0.0.1"
port: 9098
token: "xxxxxxxxxx"
coredump:
format: minidump/core/none

1
ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.SERVER
View File

@@ -60,6 +60,7 @@ olap:
hos_server:
address: "127.0.0.1"
port: 9098
token: "xxxxxxxxxx"
inline_device_settings:
keepalive:

1
ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.TSGXNXR620G40R01P0804
View File

@@ -58,6 +58,7 @@ olap:
hos_server:
address: "127.0.0.1"
port: 9098
token: "xxxxxxxxxx"
# npb_device value in [inline_device, tera,direct,etherfabric]
npb_device: etherfabric

1
ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.TSGXNXR620G40R01P1403
View File

@@ -51,6 +51,7 @@ olap:
hos_server:
address: "127.0.0.1"
port: 9098
token: "xxxxxxxxxx"
# npb_device value in [inline_device, tera,direct,etherfabric]
npb_device: etherfabric