From 02e36d0b9cf89b34da33f3e3e62a4572aebb81af Mon Sep 17 00:00:00 2001
From: Lu Qiuwen <luqiuwen@iie.ac.cn>
Date: Mon, 23 Sep 2019 11:15:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0TFE=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=AD=E5=85=B3=E4=BA=8E=E8=A7=A3=E5=AF=86?=
 =?UTF-8?q?=E6=B5=81=E9=87=8F=E8=BD=AC=E5=8F=91=E7=9A=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy.yml                            |  8 ++++----
 roles/kernel-ml/tasks/main.yml        | 10 ++++++----
 roles/tfe/tasks/main.yml              | 17 ++++++++++++-----
 roles/tfe/templates/pangu_pxy.conf.j2 |  5 +++++
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/deploy.yml b/deploy.yml
index 72f136d..6eed8bd 100644
--- a/deploy.yml
+++ b/deploy.yml
@@ -1,7 +1,7 @@
 - hosts: all
   roles:
-    - kernel-ml
     - framework
+    - kernel-ml
 
 - hosts: blade-00
   roles:
@@ -9,19 +9,19 @@
     - mrzcpd
     - kni
     - certstore
-    
+
 - hosts: blade-01
   roles:
     - tsg-env-mcn1
     - mrzcpd
     - tfe
-    
+
 - hosts: blade-02
   roles:
     - tsg-env-mcn2
     - mrzcpd
     - tfe
-    
+
 - hosts: blade-03
   roles:
     - tsg-env-mcn3
diff --git a/roles/kernel-ml/tasks/main.yml b/roles/kernel-ml/tasks/main.yml
index cb860df..5b36a07 100644
--- a/roles/kernel-ml/tasks/main.yml
+++ b/roles/kernel-ml/tasks/main.yml
@@ -6,14 +6,16 @@
 
 - name: "install kernels-ml"
   yum:
-    name: "{{ packages }}"
-    state: present
-  vars:
-    packages:
+    name:
       - /tmp/ansible_deploy/kernel/kernel-ml-5.1.8-1.el7.elrepo.x86_64.rpm
       - /tmp/ansible_deploy/kernel/kernel-ml-devel-5.1.8-1.el7.elrepo.x86_64.rpm
+    state: present
   register: t_kernel_ml
 
 - name: "set kernel-ml as default kernel"
   command: /usr/sbin/grub2-set-default 0
   when: t_kernel_ml.changed
+
+- name: "reboot"
+  reboot:
+  when: t_kernel_ml.changed
diff --git a/roles/tfe/tasks/main.yml b/roles/tfe/tasks/main.yml
index d860837..dfdd36e 100644
--- a/roles/tfe/tasks/main.yml
+++ b/roles/tfe/tasks/main.yml
@@ -4,14 +4,21 @@
     src: "{{ role_path }}/files/"
     dest: /tmp/ansible_deploy/
 
-- name: "install tfe rpms"
+- name: "install tfe rpms from localhost"
   yum:
-    name: "{{ packages }}"
-    state: present
-  vars:
-    packages:
+    name:
       - /tmp/ansible_deploy/tfe-kmod-v1.0.3.20190828-1dkms.noarch.rpm
       - /tmp/ansible_deploy/tfe-4.1.2.af90bc7-1.el7.x86_64.rpm
+    state: present
+  when: package_source == "local"
+
+- name: "install tfe rpms from pulp"
+  yum:
+    name:
+      - /tmp/ansible_deploy/tfe-kmod-v1.0.3.20190828-1dkms.noarch.rpm
+      - tfe
+    state: latest
+  when: package_source == "pulp"
 
 - name: "template tfe-env config"
   template:
diff --git a/roles/tfe/templates/pangu_pxy.conf.j2 b/roles/tfe/templates/pangu_pxy.conf.j2
index 7e3d75a..2d3596d 100644
--- a/roles/tfe/templates/pangu_pxy.conf.j2
+++ b/roles/tfe/templates/pangu_pxy.conf.j2
@@ -117,3 +117,8 @@ log_fsstat_interval=10
 log_fsstat_trig=1
 log_fsstat_dst_ip=10.4.20.201
 log_fsstat_dst_port=8125
+
+
+[traffic_mirror]
+table_info=resource/pangu/table_info_traffic_mirror.conf
+stat_file=log/traffic_mirror.status
\ No newline at end of file