From 5349fd24fbcf416b9305ed830c2050b94d000313 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Mon, 19 Oct 2020 21:56:57 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0tsg=5Fmaster=5Fentr?= =?UTF-8?q?ance=5Fid=202=E3=80=81=E4=BF=AE=E6=94=B9sapp=20configlist.inf?= =?UTF-8?q?=203=E3=80=81kni=20rpm=20install=20=E5=BC=BA=E5=88=B6=E5=AE=89?= =?UTF-8?q?=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install_config/group_vars/adc_global.yml | 4 +++- roles/kni/tasks/main.yml | 1 + roles/sapp/templates/conflist.inf.j2 | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/install_config/group_vars/adc_global.yml b/install_config/group_vars/adc_global.yml index abef9f5..6c6250d 100644 --- a/install_config/group_vars/adc_global.yml +++ b/install_config/group_vars/adc_global.yml @@ -106,4 +106,6 @@ app_sketch_local_log_level: 10 app_control_plug_log_level: 10 -breakpad_upload_url: http://127.0.0.1/ \ No newline at end of file +breakpad_upload_url: http://127.0.0.1/ + +tsg_master_entrance_id: 0 \ No newline at end of file diff --git a/roles/kni/tasks/main.yml b/roles/kni/tasks/main.yml index 6be510e..8ee8744 100644 --- a/roles/kni/tasks/main.yml +++ b/roles/kni/tasks/main.yml @@ -9,6 +9,7 @@ name: - /tmp/ansible_deploy/kni-20.10.20201019.3f20d93-2.el7.x86_64.rpm state: present + skip_broken: yes - name: Template the kni.conf template: diff --git a/roles/sapp/templates/conflist.inf.j2 b/roles/sapp/templates/conflist.inf.j2 index b22d662..4ec5ed8 100644 --- a/roles/sapp/templates/conflist.inf.j2 +++ b/roles/sapp/templates/conflist.inf.j2 @@ -11,7 +11,7 @@ {% endif %} ./plug/platform/tsg_master/tsg_master.inf {% if tsg_app_enable == 1 %} -./plug/business/app_proto_identify/app_proto_identify.inf +./plug/platform/app_proto_identify/app_proto_identify.inf ./plug/platform/app_master/app_master.inf {% endif %}