summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfumingwei <[email protected]>2020-10-19 21:56:57 +0800
committerfumingwei <[email protected]>2020-10-19 21:56:57 +0800
commit5349fd24fbcf416b9305ed830c2050b94d000313 (patch)
tree5fb56c5faf53aa318f886710fc23acc642a2c8ee
parent344c734f7061087b8126079e5b5fd068cd50b2bf (diff)
1、增加tsg_master_entrance_id 2、修改sapp configlist.inf 3、kni rpm install 强制安装
-rw-r--r--install_config/group_vars/adc_global.yml4
-rw-r--r--roles/kni/tasks/main.yml1
-rw-r--r--roles/sapp/templates/conflist.inf.j22
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 %}