From 96da9f88e940d8cec4035803fda0da8f0431f0ac Mon Sep 17 00:00:00 2001
From: zhangzhihan <zhangzhihan@zdjizhi.com>
Date: Wed, 8 Jan 2020 17:28:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Efw=E4=B8=9A=E5=8A=A1=E5=B1=82?=
 =?UTF-8?q?rpm=E5=8C=85=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E6=88=90rpm=E5=8C=85=EF=BC=8C=E4=BF=AE=E6=94=B9roles/kni/tasks?=
 =?UTF-8?q?/main.yml=EF=BC=8C=E4=BF=AE=E6=94=B9roles/kni/templates/conflis?=
 =?UTF-8?q?t.inf.j2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 roles/kni/tasks/main.yml | 71 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/roles/kni/tasks/main.yml b/roles/kni/tasks/main.yml
index eda0cf6..cd3dd57 100644
--- a/roles/kni/tasks/main.yml
+++ b/roles/kni/tasks/main.yml
@@ -7,7 +7,13 @@
 - name: "install kni rpms from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/kni-debug-3.0.1.f81dd69-1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/kni-3.0.0.b87af9b-1.el7.x86_64.rpm
+    state: present
+
+- name: "install kni-debuginfo rpms from localhost"
+  yum:
+    name:
+      - /tmp/ansible_deploy/kni-debuginfo-3.0.0.b87af9b-1.el7.x86_64.rpm
     state: present
 
 - name: Template the kni.conf
@@ -79,6 +85,69 @@
     state: present
   when: install_fw_mail_plug_debug == "yes"
 
+- name: "install dns-debug rpms from localhost"
+  yum:
+    name:
+      - /tmp/ansible_deploy/dns-debug-1.0.0.-1.el7.x86_64.rpm
+    state: present
+  when: install_dns_debug == "yes"
+
+- name: "install ftp-debug rpms from localhost"
+  yum:
+    name:
+      - /tmp/ansible_deploy/ftp-debug-1.0.0.-1.el7.x86_64.rpm
+    state: present
+  when: install_ftp_debug == "yes"
+
+- name: "install http-debug rpms from localhost"
+  yum:
+    name:
+      - /tmp/ansible_deploy/http-debug-1.0.0.-1.el7.x86_64.rpm
+    state: present
+  when: install_http_debug == "yes"
+ 
+- name: "install mail-debug rpms from localhost"
+  yum:
+    name:
+      - /tmp/ansible_deploy/mail-debug-1.0.0.-1.el7.x86_64.rpm
+    state: present
+  when: install_mail_debug == "yes"
+
+- name: "install ssl-debug rpms from localhost"
+  yum:
+    name:   
+      - /tmp/ansible_deploy/ssl-debug-1.0.0.-1.el7.x86_64.rpm
+    state: present
+  when: install_ssl_debug == "yes"
+
+- name: "install fw_dns_plug-debug rpms from localhost"
+  yum:
+    name:
+      - /tmp/ansible_deploy/fw_dns_plug-debug-1.0.2.1c9d36d-1.el7.centos.x86_64.rpm
+    state: present
+  when: install_fw_dns_plug_debug == "yes" 
+ 
+- name: "install fw_ftp_plug-debug rpms from localhost"
+  yum:
+    name:
+      - /tmp/ansible_deploy/fw_ftp_plug-debug-1.0.0.bd656e4-1.el7.centos.x86_64.rpm
+    state: present
+  when: install_fw_ftp_plug_debug == "yes"
+  
+- name: "install fw_http_plug-debug rpms from localhost"
+  yum:
+    name:
+      - /tmp/ansible_deploy/fw_http_plug-debug-1.0.2.f307503-1.el7.centos.x86_64.rpm
+    state: present
+  when: install_fw_http_plug_debug == "yes" 
+ 
+- name: "install fw_mail_plug-debug rpms from localhost"
+  yum:
+    name:
+      - /tmp/ansible_deploy/fw_mail_plug-debug-1.0.1.8792ed8-1.el7.centos.x86_64.rpm
+    state: present
+  when: install_fw_mail_plug_debug == "yes"
+
 - name: "install tsg-master rpms from localhost"
   yum:
     name: