更新mrzcpd的版本，更新部分配置文件的渲染，降级Framework中的MESA_htable版本。

10 files changed, 118 insertions, 21 deletions

diff --git a/hosts.hyadc b/hosts.hyadc
index b19588e..3ff4c05 100644
--- a/hosts.hyadc
+++ b/hosts.hyadc
@@ -2,7 +2,7 @@
 ansible_user=root

 

 [blade-00]

-192.168.10.37

+192.168.10.41

 

 [blade-03]

-192.168.10.40
\ No newline at end of file
+192.168.10.42
\ No newline at end of file
diff --git a/roles/framework/files/htable/libMESA_htable.so b/roles/framework/files/htable/libMESA_htable.so
new file mode 100644
index 0000000..601028b
--- /dev/null
+++ b/roles/framework/files/htable/libMESA_htable.so
diff --git a/roles/framework/tasks/main.yml b/roles/framework/tasks/main.yml
index 75db3ed..5351499 100644
--- a/roles/framework/tasks/main.yml
+++ b/roles/framework/tasks/main.yml
@@ -17,7 +17,7 @@
       - /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
+      - /tmp/ansible_deploy/framework/framework-2.0.9.f583d06-1.el7.centos.x86_64.rpm
 
 - name: "install/update rulescan header files"
   synchronize:
@@ -39,6 +39,11 @@
     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
 
diff --git a/roles/kni/templates/kni.conf.j2 b/roles/kni/templates/kni.conf.j2
index 82056ef..7a56243 100644
--- a/roles/kni/templates/kni.conf.j2
+++ b/roles/kni/templates/kni.conf.j2
@@ -26,12 +26,12 @@ ip_addr = 192.168.100.4
 
 [tfe_cmsg_receiver]
 listen_eth = {{ nic_inner_ctrl.name }}
-listen_port = 2375
+listen_port = 2475
 
 [watch_dog]
 switch = {{ kni.watch_dog.switch }}
 listen_eth = {{ nic_inner_ctrl.name }}
-listen_port = 2376
+listen_port = 2476
 keepalive_idle = 2
 keepalive_intvl = 1
 keepalive_cnt = 3
diff --git a/roles/mrzcpd/files/mrzcpd-4.3.9.497aaf5-1.el7.x86_64.rpm b/roles/mrzcpd/files/mrzcpd-4.3.10.497aaf5-1.el7.x86_64.rpm
index 0ff1944..bd5ed6d 100644
--- a/roles/mrzcpd/files/mrzcpd-4.3.9.497aaf5-1.el7.x86_64.rpm
+++ b/roles/mrzcpd/files/mrzcpd-4.3.10.497aaf5-1.el7.x86_64.rpm
diff --git a/roles/mrzcpd/tasks/main.yml b/roles/mrzcpd/tasks/main.yml
index 4add0b9..1461381 100644
--- a/roles/mrzcpd/tasks/main.yml
+++ b/roles/mrzcpd/tasks/main.yml
@@ -3,7 +3,6 @@
   synchronize:

     src: "{{ role_path }}/files/"

     dest: "/tmp/ansible_deploy/"

-  when: nic_traffic_mirror.use_mrzcpd

 

 - name: "install mrzcpd"

   yum:

@@ -11,17 +10,27 @@
     state: present

   vars:

     packages:

-    - /tmp/ansible_deploy/mrzcpd-4.3.9.497aaf5-1.el7.x86_64.rpm

-  when: nic_traffic_mirror.use_mrzcpd

+    - /tmp/ansible_deploy/mrzcpd-4.3.10.497aaf5-1.el7.x86_64.rpm

 

 - name: "update sysconfig/mrzcpd"

   template:

     src: "{{ role_path }}/templates/mrzcpd.j2"

     dest: /etc/sysconfig/mrzcpd

-  when: nic_traffic_mirror.use_mrzcpd

 

-- name: "update mrglobal.conf"

+- name: "update mrglobal.conf - slave blade"

   template:

     src: "{{ role_path }}/templates/mrglobal.conf.traffic_mirror.j2"

     dest: /opt/mrzcpd/etc/mrglobal.conf

-  when: nic_traffic_mirror.use_mrzcpd
\ No newline at end of file
+  when: nic_traffic_mirror is defined

+

+- name: "update mrglobal.conf - master blade"

+  template:

+    src: "{{ role_path }}/templates/mrglobal.conf.inline.j2"

+    dest: /opt/mrzcpd/etc/mrglobal.conf

+  when: nic_traffic_mirror is not defined

+

+- name: "update mrtunnat.conf - master blade"

+  template:

+    src: "{{ role_path }}/templates/mrtunnat.conf.inline.j2"

+    dest: /opt/mrzcpd/etc/mrtunnat.conf

+  when: nic_traffic_mirror is not defined
\ No newline at end of file
diff --git a/roles/mrzcpd/templates/mrglobal.conf.inline.j2 b/roles/mrzcpd/templates/mrglobal.conf.inline.j2
new file mode 100644
index 0000000..63a9b7f
--- /dev/null
+++ b/roles/mrzcpd/templates/mrglobal.conf.inline.j2
@@ -0,0 +1,76 @@
+[device]
+device={{nic_data_incoming.name}},{{nic_to_tfe.tfe0.name}},{{nic_to_tfe.tfe1.name}},{{nic_to_tfe.tfe2.name}},vxlan_user,vxlan_fwd
+sz_tunnel=8192
+sz_buffer=0
+
+[device:{{nic_data_incoming.name}}]
+{% if nic_data_incoming.ip is defined %}
+in_addr={{nic_data_incoming.ip}}
+{% endif %}
+{% if nic_data_incoming.mask is defined %}
+in_mask={{nic_data_incoming.mask}}
+{% endif %}
+{% if nic_data_incoming.gw is defined %}
+gateway={{nic_data_incoming.gw}}
+{% endif %}
+jumbo_frame=1
+max_rx_pkt_len=15360
+clear_tx_flags=1
+vlan-filter=1
+vlan-id-allow=1
+vlan-pvid=0
+vlan-pvid-mode=0
+
+[device:{{nic_to_tfe.tfe0.name}}]
+jumbo_frame=1
+max_rx_pkt_len=15360
+clear_tx_flags=1
+promisc=1
+
+[device:{{nic_to_tfe.tfe1.name}}]
+jumbo_frame=1
+max_rx_pkt_len=15360
+clear_tx_flags=1
+promisc=1
+
+[device:{{nic_to_tfe.tfe2.name}}]
+jumbo_frame=1
+max_rx_pkt_len=15360
+clear_tx_flags=1
+promisc=1
+
+[service]
+# lcore id for i/o service, use comma to split
+iocore=53,54
+distmode=3
+hashmode=0
+
+[eal]
+virtaddr=0x7f40c4a00000
+loglevel=7
+
+[keepalive]
+check_spinlock=0
+
+[ctrlzone]
+ctrlzone0=tunnat,64
+
+[pool]
+create_mode=3
+sz_direct_pktmbuf=4194304
+sz_indirect_pktmbuf=8192
+sz_cache=256
+sz_data=4096
+
+[forward]
+nr_forward_rule=10
+forward_rule_0=pv,{{nic_data_incoming.name}},{{nic_data_incoming.name}}
+forward_rule_1=vp,{{nic_data_incoming.name}},{{nic_data_incoming.name}}
+forward_rule_2=vv,vxlan_fwd,vxlan_user
+forward_rule_3=vv,vxlan_user,vxlan_fwd
+forward_rule_4=pv,{{nic_to_tfe.tfe0.name}},{{nic_to_tfe.tfe0.name}}
+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}}
\ No newline at end of file
diff --git a/roles/mrzcpd/templates/mrtunnat.conf.inline.j2 b/roles/mrzcpd/templates/mrtunnat.conf.inline.j2
new file mode 100644
index 0000000..0b9dd61
--- /dev/null
+++ b/roles/mrzcpd/templates/mrtunnat.conf.inline.j2
@@ -0,0 +1,5 @@
+[tunnat]

+lcore_id=49,50,51,52

+appsym=tunnat

+phydev={{nic_data_incoming.name}}

+virtdev=vxlan_fwd
\ No newline at end of file
diff --git a/roles/tfe/templates/tfe-env-config.j2 b/roles/tfe/templates/tfe-env-config.j2
index 1fd1f68..c49fd92 100644
--- a/roles/tfe/templates/tfe-env-config.j2
+++ b/roles/tfe/templates/tfe-env-config.j2
@@ -1,6 +1,6 @@
 
 TFE_DEVICE_DATA_INCOMING={{nic_data_incoming.name}}
-TFE_LOCAL_MAC_DATA_INCOMING=fe:65:b7:00:00:01
+TFE_LOCAL_MAC_DATA_INCOMING=fe:65:b7:03:50:bd
 TFE_PEER_MAC_DATA_INCOMING=aa:bb:cc:dd:ee:ff
 TFE_LOCAL_IP_DATA_INCOMING=172.16.241.2
 TFE_PEER_IP_DATA_INCOMING=172.16.241.1
\ No newline at end of file
diff --git a/site.yml b/site.yml
index 59d8e3b..b0de74d 100644
--- a/site.yml
+++ b/site.yml
@@ -1,26 +1,28 @@
 - hosts: blade-00
   roles:
+    - framework
+    - mrzcpd
     - kni
   vars_files:
     - "vars/common.yml"
     - "vars/kni.yml"
   vars:
   - nic_mgr:
-      name: eth0
+      name: enp7s0
   - nic_data_incoming:
-      name: eth6
+      name: ens1f4
       ip: 192.168.17.1
       mask: 255.255.255.0
       gw: 192.168.17.254
   - nic_inner_ctrl:
-      name: eth2.100
+      name: ens1.100
   - nic_to_tfe:
       tfe0:
-        name: eth7
+        name: ens1f5
       tfe1: 
-        name: eth8
+        name: ens1f6
       tfe2: 
-        name: eth9
+        name: ens1f7
 
 - hosts: blade-03
   roles:
@@ -32,12 +34,12 @@
     - "vars/tfe.yml"
   vars:
   - nic_mgr:
-      name: eth0
+      name: enp7s0
   - nic_data_incoming:
-      name: eth3
+      name: ens1f1
       mac: AA:BB:CC:DD:EE:FF
   - nic_traffic_mirror:
-      name: eth4
+      name: ens1f2
       use_mrzcpd: 1
       
 # - hosts: blade-00