gfwleak/zhangzhihan-device-management-scripts
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复cli配置文件bifang v1, v2版本差异问题.

Browse Source
This commit is contained in:
lijia
2020-10-21 10:01:40 +08:00
parent 25e4f39bcc
commit 151ba7929a
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install_config/group_vars/all.yml
View File

@@ -45,5 +45,5 @@ ha_backup:
virtual_ip: "192.168.44.58" virtual_ip: "192.168.44.58"
java_version: jdk1.8.0_73 java_version: jdk1.8.0_73
bifang_api_ip: "192.168.44.3" bifang_api_ip: "192.168.43.5"
bifang_api_port: 8080 bifang_api_port: 8080

15
roles/oam_cli/templates/application.properties.j2
View File

@@ -8,7 +8,6 @@ sn.config=/opt/tsg/etc/tsg_sn.json
tags.config=/opt/tsg/etc/tsg_tags.json tags.config=/opt/tsg/etc/tsg_tags.json
cli.agent.port=50222 cli.agent.port=50222
# oam.influx.url=http://192.168.161.134:8086
oam.influx.url=http://{{ oam.mcn0_ip }}:58086 oam.influx.url=http://{{ oam.mcn0_ip }}:58086
oam.influx.db={{ influxdb.dbname }} oam.influx.db={{ influxdb.dbname }}
oam.influx.user={{ influxdb.username }} oam.influx.user={{ influxdb.username }}
@@ -17,10 +16,12 @@ oam.influx.password={{ influxdb.passwd }}
oam.cli.user.admin=tsgadmin oam.cli.user.admin=tsgadmin
oam.cli.user.user=tsguser oam.cli.user.user=tsguser
cli.rest.root=http://{{ bifang_api_ip }}:{{ bifang_api_port }}/v1 cli.rest.root=http://{{ bifang_api_ip }}:{{ bifang_api_port }}
cli.rest.login=${cli.rest.root}/user/login cli.rest.login=${cli.rest.root}/v1/user/login
cli.rest.policy=${cli.rest.root}/policy/compile cli.rest.policy=${cli.rest.root}/v2/policy/compile
cli.rest.policy.object=${cli.rest.root}/policy/object cli.rest.policy.object=${cli.rest.root}/v1/policy/object
cli.rest.policy.object.batch=${cli.rest.root}/policy/object/batch cli.rest.policy.object.batch=${cli.rest.root}/v1/policy/object/batch
oam.rest.timeout=10000 cli.tsg_show.rows=50
oam.rest.timeout=0