更新rpm包.

15 files changed, 37 insertions, 8 deletions

diff --git a/roles/sled-mcn0/files/rpm/houyi-1.2.0.647fcd4-1.el7.x86_64.rpm b/roles/sled-mcn0/files/rpm/houyi-1.2.0.647fcd4-1.el7.x86_64.rpm
new file mode 100644
index 0000000..4517741
--- /dev/null
+++ b/roles/sled-mcn0/files/rpm/houyi-1.2.0.647fcd4-1.el7.x86_64.rpm
diff --git a/roles/sled-mcn0/files/rpm/houyi-1.2.0.78327cd-1.el7.x86_64.rpm b/roles/sled-mcn0/files/rpm/houyi-1.2.0.78327cd-1.el7.x86_64.rpm
deleted file mode 100644
index 13799bf..0000000
--- a/roles/sled-mcn0/files/rpm/houyi-1.2.0.78327cd-1.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/sled-mcn0/files/rpm/houyi-common-tools-1.0.0.ed74540-1.el7.x86_64.rpm b/roles/sled-mcn0/files/rpm/houyi-common-tools-1.0.0.ed74540-1.el7.x86_64.rpm
new file mode 100644
index 0000000..896e198
--- /dev/null
+++ b/roles/sled-mcn0/files/rpm/houyi-common-tools-1.0.0.ed74540-1.el7.x86_64.rpm
diff --git a/roles/sled-mcn0/files/rpm/houyi-common-tools-1.0.1.e757dda-1.el7.x86_64.rpm b/roles/sled-mcn0/files/rpm/houyi-common-tools-1.0.1.e757dda-1.el7.x86_64.rpm
deleted file mode 100644
index c104637..0000000
--- a/roles/sled-mcn0/files/rpm/houyi-common-tools-1.0.1.e757dda-1.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/sled-mcn0/files/rpm/houyi-plug-1.1.8.7051ab2-1.el7.x86_64.rpm b/roles/sled-mcn0/files/rpm/houyi-plug-1.1.8.7051ab2-1.el7.x86_64.rpm
new file mode 100644
index 0000000..9b46c0e
--- /dev/null
+++ b/roles/sled-mcn0/files/rpm/houyi-plug-1.1.8.7051ab2-1.el7.x86_64.rpm
diff --git a/roles/sled-mcn0/files/rpm/houyi-plug-1.2.0.203ee5c-1.el7.x86_64.rpm b/roles/sled-mcn0/files/rpm/houyi-plug-1.2.0.203ee5c-1.el7.x86_64.rpm
deleted file mode 100644
index ce16c5d..0000000
--- a/roles/sled-mcn0/files/rpm/houyi-plug-1.2.0.203ee5c-1.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/sled-mcn0/files/rpm/net_flood-2.0.3.8d3d59b-1.el7.x86_64.rpm b/roles/sled-mcn0/files/rpm/net_flood-2.0.3.8d3d59b-1.el7.x86_64.rpm
new file mode 100644
index 0000000..2a07551
--- /dev/null
+++ b/roles/sled-mcn0/files/rpm/net_flood-2.0.3.8d3d59b-1.el7.x86_64.rpm
diff --git a/roles/sled-mcn0/files/rpm/net_flood-2.1.0.27094d7-1.el7.x86_64.rpm b/roles/sled-mcn0/files/rpm/net_flood-2.1.0.27094d7-1.el7.x86_64.rpm
deleted file mode 100644
index a3bf8d7..0000000
--- a/roles/sled-mcn0/files/rpm/net_flood-2.1.0.27094d7-1.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/sled-mcn0/tasks/main.yml b/roles/sled-mcn0/tasks/main.yml
index 561ed6b..ecdfcc1 100644
--- a/roles/sled-mcn0/tasks/main.yml
+++ b/roles/sled-mcn0/tasks/main.yml
@@ -4,7 +4,7 @@
     src: "{{ role_path }}/files/rpm/{{ houyi_global.rpm_files.houyi_rpm_file }}"
     dest: "/tmp/houyi_deploy/"
 
-- name: "copy houyi_plug_rpm_file to destination server"
+- name: "copy houyi_sapp_plug_rpm_file to destination server"
   synchronize:
     src: "{{ role_path }}/files/rpm/{{ houyi_global.rpm_files.houyi_plug_rpm_file }}"
     dest: "/tmp/houyi_deploy/"
diff --git a/roles/sled-mcn0/templates/conflist.inf.j2 b/roles/sled-mcn0/templates/conflist.inf.j2
index 9c7f3dd..13bcc25 100644
--- a/roles/sled-mcn0/templates/conflist.inf.j2
+++ b/roles/sled-mcn0/templates/conflist.inf.j2
@@ -1,4 +1,5 @@
 [platform]
+./plug/platform/wire_graft/wire_graft.inf
 
 [protocol]
 
diff --git a/roles/sled-mcn0/templates/houyi.inf.j2 b/roles/sled-mcn0/templates/houyi.inf.j2
index e0b357d..0c50a70 100644
--- a/roles/sled-mcn0/templates/houyi.inf.j2
+++ b/roles/sled-mcn0/templates/houyi.inf.j2
@@ -3,3 +3,11 @@ PLUGNAME=houyi_send_plug
 SO_PATH=./plug/business/houyi/libhouyi_send_plug.so
 INIT_FUNC=houyi_plug_init
 
+[TCP_ALL]
+FUNC_FLAG=ALL
+FUNC_NAME=houyi_cc_tcpall_entry
+
+[UDP]
+FUNC_FLAG=ALL
+FUNC_NAME=houyi_cc_udp_entry
+
diff --git a/roles/sled-mcn0/templates/houyi_plug.conf.j2 b/roles/sled-mcn0/templates/houyi_plug.conf.j2
index 740046e..d51925e 100644
--- a/roles/sled-mcn0/templates/houyi_plug.conf.j2
+++ b/roles/sled-mcn0/templates/houyi_plug.conf.j2
@@ -6,3 +6,21 @@ log_interval=3
 fs2_remote_server_ip=127.0.0.1
 fs2_remote_server_port=8152
 
+[cc]
+#因双网卡透明模式下, DNS server安装在internal, 很多时候为了复用方便, nginx也装在了同一台服务器,
+#但本来cc模式是要send to external的, 此处加一个配置文件, 便于在不同环境测试.
+#正式环境下, 默认肯定是ItoE的
+default_send_dir=1
+
+[maat]
+table_info=./houyi_etc/maat_tableinfo.conf
+#json, redis, local_file
+config_src_type=redis
+#config_src_type=json
+json_cfg_file=./houyi_etc/maat_test.json
+inc_dir=./redis_dump/
+full_dir=./redis_dump/
+redis_server_ip={{houyi_global.houyi.redis_server_ip}}
+redis_server_port={{houyi_global.houyi.redis_server_port}}
+redis_index={{houyi_global.houyi.redis_index}}
+
diff --git a/roles/sled-mcn0/templates/houyi_send_log.conf.j2 b/roles/sled-mcn0/templates/houyi_send_log.conf.j2
index fb14444..df16446 100644
--- a/roles/sled-mcn0/templates/houyi_send_log.conf.j2
+++ b/roles/sled-mcn0/templates/houyi_send_log.conf.j2
@@ -3,7 +3,7 @@ Fs2_log_enable=1
 Fs2_log_local_dir_path=./log
 Fs2_server_ip=127.0.0.1
 Fs2_server_port=8125
-Fs2_interval=2
+Fs2_interval=3
 
 [kafka]
 Kafka_log_enable=1
diff --git a/roles/sled-mcn0/templates/sapp.toml.j2 b/roles/sled-mcn0/templates/sapp.toml.j2
index 0c4146e..1736cd6 100644
--- a/roles/sled-mcn0/templates/sapp.toml.j2
+++ b/roles/sled-mcn0/templates/sapp.toml.j2
@@ -25,7 +25,7 @@ BSD_packet_filter=""
    
 ### note, depolyment.mode options: [mirror, inline, transparent]
     [packet_io.depolyment]
-    mode=transparent
+    mode={{houyi_global.sapp.packet_io_depolyment.mode}}
 
 ### note, interface.type options: [pag, pcap, marsio]
 ### receive from internal interface, route dir is 0,
diff --git a/xxg_env/group_vars/all.yml b/xxg_env/group_vars/all.yml
index edf557c..a8a24a9 100644
--- a/xxg_env/group_vars/all.yml
+++ b/xxg_env/group_vars/all.yml
@@ -4,6 +4,8 @@ houyi_global:
             inbound_route_dir: 1
             internal_device: "eth5"
             external_device: "eth4"
+        packet_io_depolyment:
+            mode: "mirror"
             
     houyi:
         redis_server_ip: "192.168.40.131"
@@ -11,11 +13,11 @@ houyi_global:
         redis_index: 0
         
     rpm_files:
-        houyi_rpm_file: "houyi-1.2.0.78327cd-1.el7.x86_64.rpm"    
-        houyi_common_tools_rpm_file: "houyi-common-tools-1.0.1.e757dda-1.el7.x86_64.rpm"
-        houyi_plug_rpm_file: "houyi-plug-1.2.0.203ee5c-1.el7.x86_64.rpm"
-        net_flood_rpm_file: "net_flood-2.1.0.27094d7-1.el7.x86_64.rpm"
-        sapp_rpm_file: "sapp-4.0.8.7010e12-1.el7.x86_64.rpm"
+        houyi_rpm_file: "houyi-1.2.0.647fcd4-1.el7.x86_64.rpm"    
+        houyi_common_tools_rpm_file: "houyi-common-tools-1.0.0.ed74540-1.el7.x86_64.rpm"
+        houyi_plug_rpm_file: "houyi-plug-1.1.8.7051ab2-1.el7.x86_64.rpm"
+        net_flood_rpm_file: "net_flood-2.0.3.8d3d59b-1.el7.x86_64.rpm"
+        sapp_rpm_file: "sapp-4.0.8.c43dbc1-1.el7.x86_64.rpm"
         
     kafka:
         brokers: "192.168.40.224:9092"