diff options
| author | lijia <[email protected]> | 2021-11-02 17:05:05 +0800 |
|---|---|---|
| committer | lijia <[email protected]> | 2021-11-02 17:05:05 +0800 |
| commit | d219ba1d4fbf1c2821dc156cc00a4c726abaf2dd (patch) | |
| tree | a2ed034151c1b3d5c8c0dfda32a05d7669268485 | |
| parent | bee67777895bd352a155e2bfa057ff90855900ff (diff) | |
删除一些不用的配置项: wangw_ip, wangw_port, config_src_type;
natgw新增配置参数: wannat_bind_first_port
| -rw-r--r-- | deploy_env/group_vars/all.yml | 4 | ||||
| -rw-r--r-- | roles/natgw/templates/natgw.conf.j2 | 7 | ||||
| -rw-r--r-- | roles/toroad/templates/toroad.conf.j2 | 1 |
3 files changed, 3 insertions, 9 deletions
diff --git a/deploy_env/group_vars/all.yml b/deploy_env/group_vars/all.yml index 7308374..31f6755 100644 --- a/deploy_env/group_vars/all.yml +++ b/deploy_env/group_vars/all.yml @@ -16,9 +16,8 @@ wannat_global: natgw: device: "eth0" - wangw_ip: "192.168.40.161" - wangw_port: 3545 natgw_bind_port: 3544 + to_wangw_dst_first_port: 3545 layer2_gateway_device: "eth0" location_compare_type: 0 country_location: "Set_your_geographic_location_here" @@ -33,7 +32,6 @@ wannat_global: g_probe_retry_times: 5 max_item_number: 10000 lru_timeout: 60 - config_src_type: "redis" pptp: mtu: 2000 diff --git a/roles/natgw/templates/natgw.conf.j2 b/roles/natgw/templates/natgw.conf.j2 index 0516e88..77f5ca1 100644 --- a/roles/natgw/templates/natgw.conf.j2 +++ b/roles/natgw/templates/natgw.conf.j2 @@ -1,6 +1,7 @@ [NATGW_COMMON] logger_conf=./conf/natgw_log.conf logger_path=./log/natgw_log +logger_level=30 #0:vxlan;1:socket_test run_type=0 #0:nerver;1:LRU @@ -21,13 +22,9 @@ json_cfg_file=./conf/natgw_test.json config_type=1 [NATGW_CONVERT] -snat_mask_ip=192.168.50.147 -wannat_ip={{wannat_global.natgw.wangw_ip}} -wannat_port={{wannat_global.natgw.wangw_port}} -dnat_mask_ip=10.10.10.10 natgw_bind_port={{wannat_global.natgw.natgw_bind_port}} device={{wannat_global.natgw.layer2_gateway_device}} - +wannat_bind_first_port={{wannat_global.natgw.to_wangw_dst_first_port}} [NATGW_SNAT] Maat_redis_ip={{wannat_global.common.redis_server_ip}} diff --git a/roles/toroad/templates/toroad.conf.j2 b/roles/toroad/templates/toroad.conf.j2 index fc75f38..760b3e5 100644 --- a/roles/toroad/templates/toroad.conf.j2 +++ b/roles/toroad/templates/toroad.conf.j2 @@ -28,7 +28,6 @@ prometheus_url_path="/metrics" table_info=./etc/maat_tableinfo.conf #json, redis, local_file config_src_type=redis -#config_src_type=json json_cfg_file=./etc/maat_test.json.v3 inc_dir=./redis_dump/ full_dir=./redis_dump/ |