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

bugfix:TSG-7631:7400环境下当enable_policy_local_cache开启时，maat_redis listen固定端口7002

Browse Source
This commit is contained in:
fumingwei
2021-09-14 10:45:48 +08:00
parent 72236a02d4
commit 21ce1b8cb5
11 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/install_config/group_vars/stage_one_7400MCN0P01R01.yml
View File

@@ -68,6 +68,7 @@ tsg_diagnose:
virtual_client_nic: eth_dign_c
cm_policy_server_ip: '{% raw %}{{ cm_policy_server_ip }}{% endraw %}'
cm_policy_server_port: '{% raw %}{{ cm_policy_server_port }}{% endraw %}'
wannat_wangw:
wangw_conf:

1
ansible/install_config/group_vars/stage_one_7400MCN123P01R01.yml
View File

@@ -32,6 +32,7 @@ tfe:
default_vlan_id_for_mac: 0
cm_policy_server_ip: '{% raw %}{{ cm_policy_server_ip }}{% endraw %}'
cm_policy_server_port: '{% raw %}{{ cm_policy_server_port }}{% endraw %}'
framework:
prefix_path: /opt/tsg/framework

1
ansible/install_config/group_vars/stage_one_9000NPBP01R01.yml
View File

@@ -84,6 +84,7 @@ tsg_diagnose:
virtual_client_nic: eth_vf_dign_c
cm_policy_server_ip: '{% raw %}{{ cm.policy_server.address }}{% endraw %}'
cm_policy_server_port: '{% raw %}{{ cm.policy_server.port }}{% endraw %}'
wannat_wangw:
wangw_conf:

4
ansible/roles/certstore/templates/cert_store.ini.j2.j2
View File

@@ -70,8 +70,8 @@ port = 6379
#Maat monitors the Redsi server IP address and port number
ip = {{ cm_policy_server_ip }}
{% raw %}port = {{ cm.policy_server.port }}
dbindex = {{ cm.policy_server.db_static }}
port = {{ cm_policy_server_port }}
{% raw %}dbindex = {{ cm.policy_server.db_static }}
{% endraw %}
[stat]
statsd_server=127.0.0.1

16
ansible/roles/firewall/templates/maat.conf.j2.j2
View File

@@ -7,8 +7,8 @@ TABLE_INFO=tsgconf/tsg_static_tableinfo.conf
STAT_FILE=tsg_static_maat.status
EFFECT_INTERVAL_S=1
REDIS_IP={{ cm_policy_server_ip }}
{% raw %}REDIS_PORT={{ cm.policy_server.port }}
REDIS_INDEX={{ cm.policy_server.db_static }}
REDIS_PORT={{ cm_policy_server_port }}
{% raw %}REDIS_INDEX={{ cm.policy_server.db_static }}
{% endraw %}
JSON_CFG_FILE=tsgconf/tsg_maat.json
INC_CFG_DIR=tsgrule/inc/index/
@@ -24,8 +24,8 @@ TABLE_INFO=tsgconf/tsg_dynamic_tableinfo.conf
STAT_FILE=tsg_dynamic_maat.status
EFFECT_INTERVAL_S=1
REDIS_IP={{ cm_policy_server_ip }}
{% raw %}REDIS_PORT={{ cm.policy_server.port }}
REDIS_INDEX={{ cm.policy_server.db_dynamic }}
REDIS_PORT={{ cm_policy_server_port }}
{% raw %}REDIS_INDEX={{ cm.policy_server.db_dynamic }}
{% endraw %}
JSON_CFG_FILE=tsgconf/tsg_maat.json
INC_CFG_DIR=tsgrule/inc/index/
@@ -40,8 +40,8 @@ TABLE_INFO=tsgconf/app_sketch_tableinfo.conf
STAT_FILE=app_sketch_maat.status
EFFECT_INTERVAL_S=1
REDIS_IP={{ cm_policy_server_ip }}
{% raw %}REDIS_PORT={{ cm.policy_server.port }}
REDIS_INDEX={{ cm.policy_server.db_static }}
REDIS_PORT={{ cm_policy_server_port }}
{% raw %}REDIS_INDEX={{ cm.policy_server.db_static }}
{% endraw %}
JSON_CFG_FILE=tsgconf/app_sketch_maat.json
INC_CFG_DIR=tsgrule/inc/index/
@@ -56,8 +56,8 @@ TABLE_INFO=tsgconf/capture_packet_tableinfo.conf
STAT_FILE=capture_packet.status
EFFECT_INTERVAL_S=1
REDIS_IP={{ cm_policy_server_ip }}
{% raw %}REDIS_PORT={{ cm.policy_server.port }}
REDIS_INDEX={{ cm.policy_server.db_static }}
REDIS_PORT={{ cm_policy_server_port }}
{% raw %}REDIS_INDEX={{ cm.policy_server.db_static }}
{% endraw %}
JSON_CFG_FILE=tsgconf/capture_packet_maat.json
INC_CFG_DIR=tsgrule/inc/index/

6
ansible/roles/maat-redis/templates/maat-redis.conf.j2.j2
View File

@@ -89,8 +89,7 @@ protected-mode no
# Accept connections on the specified port, default is 6379 (IANA #815344).
# If port 0 is specified Redis will not listen on a TCP socket.
{% raw %}port {{ cm.policy_server.port }}
{% endraw %}
port 7002
# TCP listen() backlog.
#
# In high requests-per-second environments you need an high backlog in order
@@ -155,8 +154,7 @@ supervised no
#
# Creating a pid file is best effort: if Redis is not able to create it
# nothing bad happens, the server will start and run normally.
{% raw %}pidfile /var/run/redis_{{ cm.policy_server.port }}.pid
{% endraw %}
pidfile /var/run/redis_7002.pid
# Specify the server verbosity level.
# This can be one of:
# debug (a lot of information, useful for development/testing)

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

@@ -45,9 +45,8 @@ log_fsstat_dst_port=8125
enable=0
token_name=ratelimit
redis_server={{ cm_policy_server_ip }}
{% raw %}redis_port={{ cm.policy_server.port }}
redis_port={{ cm_policy_server_port }}
redis_db_index=6
{% endraw %}
[tango_cache]
enable_cache=0

4
ansible/roles/tfe/templates/tfe.conf.j2.j2
View File

@@ -219,8 +219,8 @@ json_cfg_file=resource/pangu/pangu_http.json
# redis mode conf iterm
maat_redis_server={{ cm_policy_server_ip }}
{% raw %}maat_redis_port_range={{ cm.policy_server.port }}
maat_redis_db_index={{ cm.policy_server.db_static }}
maat_redis_port_range={{ cm_policy_server_port }}
{% raw %}maat_redis_db_index={{ cm.policy_server.db_static }}
{% endraw %}
# iris mode conf iterm

5
ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN0P01R01
View File

@@ -77,10 +77,11 @@
- name: "set cm_policy_server_ip var depend on enable_policy_local_cache"
set_fact:
cm_policy_server_ip: "{{ item.cm_policy_server_ip }}"
cm_policy_server_port: "{{ item.cm_policy_server_port }}"
when: feature.enable_policy_local_cache == item.enable_policy_local_cache
with_items:
- { "enable_policy_local_cache": 1, "npb_device": tera, "cm_policy_server_ip": 192.168.100.1 }
- { "enable_policy_local_cache": 0, "npb_device": inline_device, "cm_policy_server_ip": "{{ cm.policy_server.address }}" }
- { "enable_policy_local_cache": 1, "npb_device": tera, "cm_policy_server_ip": 192.168.100.1, "cm_policy_server_port": 7002 }
- { "enable_policy_local_cache": 0, "npb_device": inline_device, "cm_policy_server_ip": "{{ cm.policy_server.address }}", "cm_policy_server_port": "{{ cm.policy_server.port }}"}
- name: "Add sapp service service_attach_startpre.conf.tera when NPB_device type is tera"
copy:

5
ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN123P01R01
View File

@@ -58,10 +58,11 @@
- name: "set cm_policy_server_ip var depend on enable_policy_local_cache"
set_fact:
cm_policy_server_ip: "{{ item.cm_policy_server_ip }}"
cm_policy_server_port: "{{ item.cm_policy_server_port }}"
when: feature.enable_policy_local_cache == item.enable_policy_local_cache
with_items:
- { "enable_policy_local_cache": 1, "cm_policy_server_ip": 192.168.100.1 }
- { "enable_policy_local_cache": 0, "cm_policy_server_ip": "{{cm.policy_server.address}}" }
- { "enable_policy_local_cache": 1, "cm_policy_server_ip": 192.168.100.1, "cm_policy_server_port": 7002 }
- { "enable_policy_local_cache": 0, "cm_policy_server_ip": "{{cm.policy_server.address}}", "cm_policy_server_port": "{{ cm.policy_server.port }}"}
- name: "tsg-os-provision: template the tsg_device_tag"
template:

2
ansible/roles/wannat_wangw/templates/wangw.conf.j2.j2
View File

@@ -47,8 +47,8 @@ inc_dir=./redis_dump/
full_dir=./redis_dump/
redis_server_ip={{ cm_policy_server_ip }}
redis_server_port={{ cm_policy_server_port }}
{% raw %}REDIS_PORT_NUM={{ cm.policy_server.port_num }}
redis_server_port={{ cm.policy_server.port }}
redis_index={{ cm.policy_server.db_static }}
{% endraw %}