Merge branch 'astana-deploy-201909' of git.mesalab.cn:tango/tsg-scripts into astana-deploy-201909

env-stage-xxg/group_vars/all.yml

@@ -1,5 +1,5 @@
 maat_redis_server:
-    address: 192.168.40.120
+    address: "192.168.40.120"
     port: 7002
     db: 0
     
@@ -9,7 +9,7 @@ dynamic_maat_redis_server:
     db: 0
 
 cert_store_server:
-    address: 192.168.40.161
+    address: "192.168.40.161"
     port: 9991
 
 log_kafkabrokers:
@@ -44,5 +44,11 @@ kni:
 tfe:
     nr_threads: 32
     keykeeper:
-        mode: "debug"
+        mode: "normal"
         no_cache: 0
+
+mrzcpd:
+    iocore: 47
+
+mrtunnat:
+    lcore_id: 46

env-stage-xxg/group_vars/blade-00.yml

@@ -1,7 +1,8 @@
 nic_mgr:
-    name: enp8s0
+    name: enp6s0
 nic_data_incoming:
     name: ens1f4
+    address: 127.0.0.1
 nic_inner_ctrl:
     name: ens1.100
 nic_to_tfe:

env-stage-xxg/group_vars/blade-01.yml

@@ -1,8 +1,9 @@
 nic_mgr:
-    name: enp8s0
+    name: enp6s0
 nic_data_incoming:
     name: ens1f1
     mac: AA:BB:CC:DD:EE:FF
+    address: 127.0.0.1
 nic_inner_ctrl:
     name: ens1.100
 nic_traffic_mirror:

env-stage-xxg/group_vars/blade-02.yml

@@ -1,10 +1,10 @@
 nic_mgr:
-    name: enp8s0
+    name: enp6s0
 nic_data_incoming:
     name: ens8f1
     mac: AA:BB:CC:DD:EE:FF
 nic_inner_ctrl:
-    name: ens1.100
+    name: ens8.100
 nic_traffic_mirror:
     name: ens8f2
     use_mrzcpd: 1

env-stage-xxg/group_vars/blade-03.yml

@@ -1,10 +1,10 @@
 nic_mgr:
-    name: enp8s0
+    name: enp6s0
 nic_data_incoming:
     name: ens8f1
     mac: AA:BB:CC:DD:EE:FF
 nic_inner_ctrl:
-    name: ens1.100
+    name: ens8.100
 nic_traffic_mirror:
     name: ens8f2
     use_mrzcpd: 1

env-stage-xxg/hosts

@@ -1,15 +1,15 @@
 [all:vars]
 ansible_user=root
-package_source=pulp
+package_source=local
 
 [blade-00]
-192.168.40.161
+192.168.40.21
 
 [blade-01]
-192.168.40.162
+192.168.40.22
 
 [blade-02]
-192.168.40.163
+192.168.40.23
 
 [blade-03]
-192.168.40.164
+192.168.40.24

roles/kni/tasks/main.yml

@@ -1,7 +1,8 @@
 ---
-- name: Ensures /home/tsg exists
-  file: path=/home/tsg state=directory 
-  tags: mkdir
+- name: "copy sapp and kni to destination server"
+  copy:
+    src: "{{ role_path }}/files/"
+    dest: /tmp/ansible_deploy/
 
 - name: "install sapp rpms from localhost"
   yum:

roles/kni/templates/gdev.conf.j2

@@ -1,5 +1,5 @@
 [Module]
 pcapdevice={{ nic_data_incoming.name }}
 sendto_gdev_card={{ nic_data_incoming.name }}
-sendto_gdev_ip={{ nic_data_incoming.ip }}
+sendto_gdev_ip={{ nic_data_incoming.address }}
 gdev_status_switch=1

roles/kni/templates/kni.conf.j2

@@ -37,8 +37,13 @@ keepalive_cnt = 3
 
 [static_maat]
 readconf_mode = {{ kni.maat.readconf_mode }}
+<<<<<<< HEAD
 tableinfo_path = ./conf/kni/static_maat_tableinfo.conf
 maatjson_path = ./conf/kni/maat_test.json
+=======
+tableinfo_path = ./etc/kni/maat_tableinfo.conf
+maatjson_path = ./etc/kni/maat_test.json
+>>>>>>> 58004fe3153e15435552a47a28c7944d10b363f0
 redis_ip = {{ maat_redis_server.address }}
 redis_port = {{ maat_redis_server.port }}
 redis_index = {{ maat_redis_server.db }}

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

@@ -41,7 +41,7 @@ promisc=1
 
 [service]
 # lcore id for i/o service, use comma to split
-iocore=53,54
+iocore={{ mrzcpd.iocore }}
 distmode=2
 hashmode=0
 

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

@@ -10,7 +10,7 @@ clear_tx_flags=1
 promisc=1
 
 [service]
-iocore=55
+iocore={{ mrzcpd.iocore }}
 
 [eal]
 virtaddr=0x7d0000000000

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

@@ -1,5 +1,5 @@
 [tunnat]
-lcore_id=49,50,51,52
+lcore_id={{ mrtunnat.lcore_id }}
 appsym=tunnat
 phydev={{nic_data_incoming.name}}
 virtdev=vxlan_fwd

roles/tfe/templates/tfe.conf.j2

@@ -37,6 +37,7 @@ passthrough_all_tcp=0
 
 [traffic_mirror]
 device= {{ nic_traffic_mirror.name }}
+type = 1
 
 [ratelimit]
 #read_rate=200000