From 151ba7929a422175b3743a74d85ac83fa7902478 Mon Sep 17 00:00:00 2001 From: lijia Date: Wed, 21 Oct 2020 10:01:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dcli=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6bifang=20v1,=20v2=E7=89=88=E6=9C=AC=E5=B7=AE?= =?UTF-8?q?=E5=BC=82=E9=97=AE=E9=A2=98.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install_config/group_vars/all.yml | 2 +- roles/oam_cli/templates/application.properties.j2 | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/install_config/group_vars/all.yml b/install_config/group_vars/all.yml index ce600c5..95642ee 100644 --- a/install_config/group_vars/all.yml +++ b/install_config/group_vars/all.yml @@ -45,5 +45,5 @@ ha_backup: virtual_ip: "192.168.44.58" java_version: jdk1.8.0_73 -bifang_api_ip: "192.168.44.3" +bifang_api_ip: "192.168.43.5" bifang_api_port: 8080 diff --git a/roles/oam_cli/templates/application.properties.j2 b/roles/oam_cli/templates/application.properties.j2 index 10025ea..bbe9082 100755 --- a/roles/oam_cli/templates/application.properties.j2 +++ b/roles/oam_cli/templates/application.properties.j2 @@ -8,7 +8,6 @@ sn.config=/opt/tsg/etc/tsg_sn.json tags.config=/opt/tsg/etc/tsg_tags.json cli.agent.port=50222 -# oam.influx.url=http://192.168.161.134:8086 oam.influx.url=http://{{ oam.mcn0_ip }}:58086 oam.influx.db={{ influxdb.dbname }} oam.influx.user={{ influxdb.username }} @@ -17,10 +16,12 @@ oam.influx.password={{ influxdb.passwd }} oam.cli.user.admin=tsgadmin oam.cli.user.user=tsguser -cli.rest.root=http://{{ bifang_api_ip }}:{{ bifang_api_port }}/v1 -cli.rest.login=${cli.rest.root}/user/login -cli.rest.policy=${cli.rest.root}/policy/compile -cli.rest.policy.object=${cli.rest.root}/policy/object -cli.rest.policy.object.batch=${cli.rest.root}/policy/object/batch +cli.rest.root=http://{{ bifang_api_ip }}:{{ bifang_api_port }} +cli.rest.login=${cli.rest.root}/v1/user/login +cli.rest.policy=${cli.rest.root}/v2/policy/compile +cli.rest.policy.object=${cli.rest.root}/v1/policy/object +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