单机功能测试现场部署脚本定稿

roles/framework/tasks/main.yml

@@ -4,18 +4,12 @@
     src: "{{ role_path }}/files/"
     dest: "/tmp/ansible_deploy/"
 
-- name: "install kernels and other packages"
+- name: "install framework packages"
   yum:
     name: "{{ packages }}"
     state: present
   vars:
     packages:
-      - /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
-      - /tmp/ansible_deploy/dkms/zlib-devel-1.2.7-18.el7.x86_64.rpm
-      - /tmp/ansible_deploy/dkms/elfutils-libelf-devel-0.172-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/dkms/zlib-1.2.7-18.el7.x86_64.rpm
-      - /tmp/ansible_deploy/dkms/which-2.20-7.el7.x86_64.rpm
       - /tmp/ansible_deploy/dkms/dkms-2.7.1-1.el7.noarch.rpm
       - /tmp/ansible_deploy/framework/framework-2.0.9.f583d06-1.el7.centos.x86_64.rpm
 
@@ -39,13 +33,5 @@
     src: "{{ role_path }}/files/maat/lib/"
     dest: /opt/MESA/lib/
 
-- name: "downgrade htable"
-  synchronize:
-    src: "{{ role_path }}/files/htable"
-    dest: /opt/MESA/lib/
-
 - name: "update ld"
   command: ldconfig
-
-- name: "set kernel-ml as default kernel"
-  command: /usr/sbin/grub2-set-default 0

roles/kernel-ml/tasks/main.yml

@@ -0,0 +1,19 @@
+---
+- name: "copy framework rpms to destination server"
+  synchronize:
+    src: "{{ role_path }}/files/"
+    dest: "/tmp/ansible_deploy/"
+
+- name: "install kernels-ml"
+  yum:
+    name: "{{ packages }}"
+    state: present
+  vars:
+    packages:
+      - /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
+  register: t_kernel_ml
+
+- name: "set kernel-ml as default kernel"
+  command: /usr/sbin/grub2-set-default 0
+  when: t_kernel_ml.changed

roles/kni/tasks/main.yml

@@ -5,7 +5,7 @@
   
 - name: Extract kni.tar.gz
   unarchive:
-    src: "{{ role_path }}/files/kni.tar.gz"
+    src: "{{ role_path }}/files/kni_20190630.tar.gz"
     dest: /home/tsg
   tags: extract
 
@@ -15,8 +15,12 @@
     dest: /home/tsg/kni/conf/kni/kni.conf
   tags: template
 
-- name: Template the gdev.conf
-  template:
-    src: "{{ role_path }}/templates/gdev.conf.j2"
-    dest: /home/tsg/kni/conf/gdev.conf
-  tags: template
+- name: bootup sapp
+  blockinfile:
+    path: /etc/rc.d/rc.local
+    block: |
+        systemctl start mrzcpd
+        systemctl start mrtunnat
+        sleep 15
+        cd /home/tsg/kni; ./r2
+

roles/mrzcpd/templates/mrglobal.conf.inline.j2

@@ -17,7 +17,7 @@ jumbo_frame=1
 max_rx_pkt_len=15360
 clear_tx_flags=1
 vlan-filter=1
-vlan-id-allow=1
+vlan-id-allow=3811,3812,3821,3822
 vlan-pvid=0
 vlan-pvid-mode=0
 
@@ -73,4 +73,4 @@ forward_rule_5=vp,{{nic_to_tfe.tfe0.name}},{{nic_to_tfe.tfe0.name}}
 forward_rule_6=pv,{{nic_to_tfe.tfe1.name}},{{nic_to_tfe.tfe1.name}}
 forward_rule_7=vp,{{nic_to_tfe.tfe1.name}},{{nic_to_tfe.tfe1.name}}
 forward_rule_8=pv,{{nic_to_tfe.tfe2.name}},{{nic_to_tfe.tfe2.name}}
-forward_rule_9=vp,{{nic_to_tfe.tfe2.name}},{{nic_to_tfe.tfe2.name}}
+forward_rule_9=vp,{{nic_to_tfe.tfe2.name}},{{nic_to_tfe.tfe2.name}}

roles/mrzcpd/templates/mrtunnat.conf.inline.j2

@@ -2,4 +2,15 @@
 lcore_id=49,50,51,52
 appsym=tunnat
 phydev={{nic_data_incoming.name}}
-virtdev=vxlan_fwd
+virtdev=vxlan_fwd
+nr_max_sessions=131070
+expire_time=180
+reverse_tunnel=0
+use_recent_tunnel=0
+
+[vlan_flipping]
+enable=1
+c_router_vlan_id_0=3811
+i_router_vlan_id_0=3812
+c_router_vlan_id_1=3821
+i_router_vlan_id_1=3822

roles/tfe/tasks/main.yml

@@ -10,7 +10,7 @@
     state: present
   vars:
     packages:
-      - /tmp/ansible_deploy/tfe-4.0.1.c7ecf01-1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tfe-4.0.5.348afbc-1.el7.x86_64.rpm
       - /tmp/ansible_deploy/tfe-kmod-6ed8c79-1dkms.noarch.rpm
 
 - name: "template tfe-env config"
@@ -28,7 +28,7 @@
     src: "{{ role_path }}/templates/pangu_pxy.conf.j2"
     dest: /home/tsg/tfe/conf/pangu/pangu_pxy.conf
 
-- name: "add tfe-kmod to boot"
+- name: "start tfe-kmod"
   modprobe:
     name: tfe_kmod
     state: present
@@ -36,6 +36,18 @@
 - name: "enable tfe-env"
   systemd:
     name: tfe-env
-    enabled: no
+    enabled: yes
     daemon_reload: yes
-    state: restarted
+    state: restarted
+
+- name: "add tfe-kmod to boot"
+  template:
+    src: "{{ role_path }}/templates/tfe_kmod.conf.j2"
+    dest: /etc/modules-load.d/tfe_kmod.conf
+
+- name: "bootup tfe"
+  blockinfile:
+    path: /etc/rc.d/rc.local
+    block: |
+        systemctl start tfe-env
+        cd /home/tsg/tfe; ./r2_tfe

roles/tfe/templates/tfe.conf.j2

@@ -49,7 +49,7 @@ so_keepalive=1
 tcp_keepcnt=8
 tcp_keepintvl=15
 tcp_keepidle=30
-tcp_user_timeout=30
+tcp_user_timeout=600
 tcp_ttl_upstream=75
 tcp_ttl_downstream=70
 
@@ -61,4 +61,4 @@ statsd_server=192.168.10.72
 statsd_port=8126
 
 [http]
-loglevel=20
+loglevel=20

roles/tfe/templates/tfe_kmod.conf.j2

@@ -0,0 +1,2 @@
+# load tfe_kmod at boot
+tfe_kmod