wangw v20.09.

roles/toroad/tasks/main.yml

@@ -25,15 +25,9 @@
 - name: "Template the toroad.conf"
   template:
     src: "{{ role_path }}/templates/toroad.conf.j2"
-    dest: /home/mesasoft/sapp_run/etc/wire_graft/wire_graft.conf
-  tags: template
-
-
-- name: "Template the test_sip_succ.list"
-  template:
-    src: "{{ role_path }}/templates/test_sip_succ.list.j2"
-    dest: /opt/wannat/toroad/etc/test_sip_succ.list
+    dest: /opt/wannat/toroad/etc/toroad.conf
   tags: template
 
 
 
+

roles/toroad/templates/toroad.conf.j2

@@ -2,11 +2,11 @@
 http_server_listen_port=8888
 wangw_ip_list_file=wangw_ip_list_file.conf
 probe_pkt_timeout=1
-probe_retry_times=3
+probe_retry_times=2
 
 
 [runtime_log]
-log_level=20
+log_level=30
 log_file=./toroad_log/toroad.log
 
 [field_stat2]

roles/wangw/tasks/main.yml

@@ -8,6 +8,11 @@
   synchronize:
     src: "{{ role_path }}/files/rpm/{{ wangw_global.rpm_files.wire_graft_rpm_file }}"
     dest: "/tmp/wannat_deploy/"
+
+- name: "copy wiregraft_devel_rpm_file to destination server"
+  synchronize:
+    src: "{{ role_path }}/files/rpm/{{ wangw_global.rpm_files.wire_graft_devel_rpm_file }}"
+    dest: "/tmp/wannat_deploy/"
     
 - name: "install wangw"
   yum:
@@ -24,6 +29,14 @@
   vars:
     packages:
     - /tmp/wannat_deploy/{{ wangw_global.rpm_files.wire_graft_rpm_file }}    
+
+- name: "install wiregraft_devel"
+  yum:
+    name: "{{ packages }}"
+    state: present
+  vars:
+    packages:
+    - /tmp/wannat_deploy/{{ wangw_global.rpm_files.wire_graft_devel_rpm_file }}    
     
 - name: "Creates ./etc/wannat directory"
   file:

roles/wangw/templates/wire_graft.conf.j2

@@ -4,7 +4,16 @@
 stream_project_tag_enable=1
 
 #用于标识本机ip使用哪块网卡,可能是管理口,可能是其他业务口
-identification_by_which_device=enp8s0
+identification_by_which_device={{wangw_global.wiregraft.identification_by_which_device}}
+
+#单个流超过此包数的才发送链路信息, 防止遭受ddos攻击疯狂发日志
+at_least_total_num=3
+at_least_total_byte=5
+
+[toroad]
+sendto_toroad_enable=1
+toroad_ip={{wangw_global.wiregraft.toroad_server_ip}}
+toroad_port=8888
 
 [log]
-log_level=20
+log_level=30

wangw-uninstall.yml

@@ -19,6 +19,17 @@
         name: "libwangw"
         state: absent           
 
+    - name: "uninstall libwire_graft"
+      yum:
+        name: "libwire_graft"
+        state: absent           
+        
+    - name: "uninstall libwire_graft-devel"
+      yum:
+        name: "libwire_graft-devel"
+        state: absent           
+
+        
     - name: "uninstall toroad"
       yum:
         name: "toroad"

xxg_integration_env/group_vars/all.yml

@@ -9,24 +9,24 @@ wangw_global:
             mode: "inline"
             
     wangw:
-        NAT_GW_tunnel_device: "enp8s0"
+        NAT_GW_tunnel_device: "enp6s0"
         NAT_GW_tunnel_ip: "192.168.40.134"
-        redis_server_ip: "192.168.40.120"
-        redis_server_port: 7003
+        redis_server_ip: "192.168.44.17"
+        redis_server_port: 7002
         redis_index: 0
 
     toroad:
-        redis_server_ip: "192.168.40.120"
-        redis_server_port: 7003
+        redis_server_ip: "192.168.44.17"
+        redis_server_port: 7002
         redis_index: 0
     
     wiregraft:
-        identification_by_which_device:"enp8s0"
+        identification_by_which_device:"enp6s0"
+        toroad_server_ip: "192.168.40.134"
         
     rpm_files:
-        wangw_rpm_file: "libwangw-1.0.8.dbd02f6-x86_64...rpm"    
-        wire_graft_rpm_file: "libwire_graft-1.0.19.7cdff59-x86_64...rpm"
-        toroad_rpm_file: "toroad-1.0.8.63c176a-x86_64...rpm"
-
-        
+        wangw_rpm_file: "libwangw-1.1.1.ce9bd59-2.el7.x86_64.rpm"    
+        wire_graft_rpm_file: "libwire_graft-1.1.4.ab9badd-2.el7.x86_64.rpm"
+        wire_graft_devel_rpm_file: "libwire_graft-devel-1.1.4.ab9badd-2.el7.x86_64.rpm"
+        toroad_rpm_file: "toroad-1.1.3.466cd11-2.el7.x86_64.rpm"
 

xxg_test_env/group_vars/all.yml

@@ -22,11 +22,11 @@ wangw_global:
     
     wiregraft:
         identification_by_which_device:"enp8s0"
+        toroad_server_ip: "192.168.40.133"
         
     rpm_files:
-        wangw_rpm_file: "libwangw-1.0.8.dbd02f6-2.el7.x86_64.rpm"    
-        wire_graft_rpm_file: "libwire_graft-1.0.20.9aaf15b-2.el7.x86_64.rpm"
-        toroad_rpm_file: "toroad-1.0.8.63c176a-2.el7.x86_64.rpm"
-
-        
-
+        wangw_rpm_file: "libwangw-1.1.1.ce9bd59-2.el7.x86_64.rpm"    
+        wire_graft_rpm_file: "libwire_graft-1.1.4.ab9badd-2.el7.x86_64.rpm"
+        wire_graft_devel_rpm_file: "libwire_graft-devel-1.1.4.ab9badd-2.el7.x86_64.rpm"
+        toroad_rpm_file: "toroad-1.1.3.466cd11-2.el7.x86_64.rpm"
+