升级依赖的rpm包, 修改配置文件.

12 files changed, 56 insertions, 14 deletions

diff --git a/houyi-uninstall.yml b/houyi-uninstall.yml
index d33c323..1824f24 100644
--- a/houyi-uninstall.yml
+++ b/houyi-uninstall.yml
@@ -1,6 +1,16 @@
 ---
 - hosts: sled-mcn0
   tasks:
+    - name: "stop sapp service"
+      service:
+        name: sapp
+        state: stopped
+
+    - name: "stop houyi service"
+      service:
+        name: houyi
+        state: stopped
+      
     - name: "uninstall sapp"
       yum:
         name: "sapp"
@@ -16,14 +26,25 @@
         name: "houyi-plug"
         state: absent           
 
+    - name: "uninstall net_flood"
+      yum:
+        name: "net_flood"
+        state: absent
+        
     - name: "remove sapp"
       file: 
         path: /home/mesasoft/sapp_run/
         state: absent
         force: 1
+
+    - name: "remove sapp service"
+      file: 
+        path: /usr/lib/systemd/system/sapp.service
+        state: absent
+        force: 1
         
-    - name: "remove houyi" 
+    - name: "remove houyi service" 
       file: 
-        path: /opt/houyi/
+        path: /usr/lib/systemd/system/houyi.service
         state: absent
         force: 1        
\ No newline at end of file
diff --git a/roles/sled-mcn0/files/rpm/bind9-v9_14_9_with_config.tgz b/roles/sled-mcn0/files/rpm/bind9-v9_14_9_with_config.tgz
new file mode 100644
index 0000000..ce33380
--- /dev/null
+++ b/roles/sled-mcn0/files/rpm/bind9-v9_14_9_with_config.tgz
diff --git a/roles/sled-mcn0/files/rpm/houyi-plug-1.0.0.2a4c05f-1.el7.x86_64.rpm b/roles/sled-mcn0/files/rpm/houyi-plug-1.0.0.2a4c05f-1.el7.x86_64.rpm
deleted file mode 100644
index 935ac1b..0000000
--- a/roles/sled-mcn0/files/rpm/houyi-plug-1.0.0.2a4c05f-1.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/sled-mcn0/files/rpm/houyi-plug-1.0.0.9b70834-1.el7.x86_64.rpm b/roles/sled-mcn0/files/rpm/houyi-plug-1.0.0.9b70834-1.el7.x86_64.rpm
new file mode 100644
index 0000000..55d1d9c
--- /dev/null
+++ b/roles/sled-mcn0/files/rpm/houyi-plug-1.0.0.9b70834-1.el7.x86_64.rpm
diff --git a/roles/sled-mcn0/files/rpm/net_flood-2.0.3.2e9450d-1.el7.x86_64.rpm b/roles/sled-mcn0/files/rpm/net_flood-2.0.3.2e9450d-1.el7.x86_64.rpm
new file mode 100644
index 0000000..2175410
--- /dev/null
+++ b/roles/sled-mcn0/files/rpm/net_flood-2.0.3.2e9450d-1.el7.x86_64.rpm
diff --git a/roles/sled-mcn0/files/rpm/net_flood-2.0.3.6ae51f2-1.el7.x86_64.rpm b/roles/sled-mcn0/files/rpm/net_flood-2.0.3.6ae51f2-1.el7.x86_64.rpm
deleted file mode 100644
index 405ac96..0000000
--- a/roles/sled-mcn0/files/rpm/net_flood-2.0.3.6ae51f2-1.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/sled-mcn0/files/rpm/sapp-4.0.7.06731c3-1.el7.x86_64.rpm b/roles/sled-mcn0/files/rpm/sapp-4.0.7.06731c3-1.el7.x86_64.rpm
deleted file mode 100644
index 03772b3..0000000
--- a/roles/sled-mcn0/files/rpm/sapp-4.0.7.06731c3-1.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/sled-mcn0/files/rpm/sapp-4.0.7.f31c99c-1.el7.x86_64.rpm b/roles/sled-mcn0/files/rpm/sapp-4.0.7.f31c99c-1.el7.x86_64.rpm
new file mode 100644
index 0000000..ea05fc1
--- /dev/null
+++ b/roles/sled-mcn0/files/rpm/sapp-4.0.7.f31c99c-1.el7.x86_64.rpm
diff --git a/roles/sled-mcn0/tasks/main.yml b/roles/sled-mcn0/tasks/main.yml
index 914656a..6748a71 100644
--- a/roles/sled-mcn0/tasks/main.yml
+++ b/roles/sled-mcn0/tasks/main.yml
@@ -1,22 +1,22 @@
 ---
 - name: "copy houyi_rpm_file to destination server"
   synchronize:
-    src: "{{ role_path }}/files/rpm/{{ houyi_rpm_file }}"
+    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"
   synchronize:
-    src: "{{ role_path }}/files/rpm/{{ houyi_plug_rpm_file }}"
+    src: "{{ role_path }}/files/rpm/{{ houyi_global.rpm_files.houyi_plug_rpm_file }}"
     dest: "/tmp/houyi_deploy/"
     
 - name: "copy net_flood_rpm_file to destination server"
   synchronize:
-    src: "{{ role_path }}/files/rpm/{{ net_flood_rpm_file }}"
+    src: "{{ role_path }}/files/rpm/{{ houyi_global.rpm_files.net_flood_rpm_file }}"
     dest: "/tmp/houyi_deploy/"
 
 - name: "copy sapp_rpm_file to destination server"
   synchronize:
-    src: "{{ role_path }}/files/rpm/{{ sapp_rpm_file }}"
+    src: "{{ role_path }}/files/rpm/{{ houyi_global.rpm_files.sapp_rpm_file }}"
     dest: "/tmp/houyi_deploy/"
 
 - name: "install sapp"
@@ -25,7 +25,7 @@
     state: present
   vars:
     packages:
-    - /tmp/houyi_deploy/{{ sapp_rpm_file }}
+    - /tmp/houyi_deploy/{{ houyi_global.rpm_files.sapp_rpm_file }}
 
 - name: "install houyi"
   yum:
@@ -33,7 +33,7 @@
     state: present
   vars:
     packages:
-    - /tmp/houyi_deploy/{{ houyi_rpm_file }}
+    - /tmp/houyi_deploy/{{ houyi_global.rpm_files.houyi_rpm_file }}
 
 - name: "install houyi-plug"
   yum:
@@ -41,7 +41,7 @@
     state: present
   vars:
     packages:
-    - /tmp/houyi_deploy/{{ houyi_plug_rpm_file }}
+    - /tmp/houyi_deploy/{{ houyi_global.rpm_files.houyi_plug_rpm_file }}
 
 - name: "install net_flood"
   yum:
@@ -49,7 +49,7 @@
     state: present
   vars:
     packages:
-    - /tmp/houyi_deploy/{{ net_flood_rpm_file }}
+    - /tmp/houyi_deploy/{{ houyi_global.rpm_files.net_flood_rpm_file }}
 
 
 
@@ -82,6 +82,12 @@
     src: "{{ role_path }}/templates/houyi_plug_static_arp.conf.j2"
     dest: /home/mesasoft/sapp_run/houyi_etc/houyi_plug_static_arp.conf
   tags: template
+
+- name: "Template houyi_plug_arp_network.conf"
+  template:
+    src: "{{ role_path }}/templates/houyi_plug_arp_network.conf.j2"
+    dest: /home/mesasoft/sapp_run/houyi_etc/houyi_plug_arp_network.conf
+  tags: template
   
 - name: "Template houyi.conf"
   template:
diff --git a/roles/sled-mcn0/templates/houyi_plug_arp_network.conf.j2 b/roles/sled-mcn0/templates/houyi_plug_arp_network.conf.j2
new file mode 100644
index 0000000..068b289
--- /dev/null
+++ b/roles/sled-mcn0/templates/houyi_plug_arp_network.conf.j2
@@ -0,0 +1,8 @@
+#arp查询的源ip不能随意写, 因为可能不通过sapp, 必须要保证两端ip段不一致
+#或者是写个肯定不存在的sip和smac, arp回复时也能过sapp.
+
+#dir  network mask-bit-num mac-addr
+#dir: 0:C2I,  1:I2C
+#example:
+0   192.168.10.0	24 46:9d:8e:37:53:11
+1   192.168.10.128	24 46:9d:8e:37:53:22
\ No newline at end of file
diff --git a/roles/sled-mcn0/templates/houyi_plug_static_arp.conf.j2 b/roles/sled-mcn0/templates/houyi_plug_static_arp.conf.j2
index d948459..b65b924 100644
--- a/roles/sled-mcn0/templates/houyi_plug_static_arp.conf.j2
+++ b/roles/sled-mcn0/templates/houyi_plug_static_arp.conf.j2
@@ -2,5 +2,6 @@
 #dir  ip-version  ip-string  mac-addr-with':'
 #dir: 0:C2I, outbound_device;  1:I2C, inbound_device
 #example:
-#0   4		192.168.40.161	46:9d:8e:37:53:f9
+0   4		10.3.22.222	46:9d:8e:37:53:f1
+1   4		10.3.22.12	46:9d:8e:37:53:f2
 #0   6		fe80::449d:8eff:fe37:53f9	46:9d:8e:37:53:f9
\ No newline at end of file
diff --git a/xxg_env/group_vars/all.yml b/xxg_env/group_vars/all.yml
index 3eff83a..c79802a 100644
--- a/xxg_env/group_vars/all.yml
+++ b/xxg_env/group_vars/all.yml
@@ -4,6 +4,12 @@ houyi_global:
             inbound_device: "eth0"
             outbound_device: "eth1"
     houyi:
-        redis_server_ip: "192.168.40.111"
-        redis_server_port: 27002
-        redis_index: 0
\ No newline at end of file
+        redis_server_ip: "192.168.40.120"
+        redis_server_port: 7002
+        redis_index: 0
+        
+    rpm_files:
+        houyi_rpm_file: "houyi-1.0.0.26712da-1.el7.x86_64.rpm"    
+        houyi_plug_rpm_file: "houyi-plug-1.0.0.9b70834-1.el7.x86_64.rpm"
+        net_flood_rpm_file: "net_flood-2.0.3.2e9450d-1.el7.x86_64.rpm"
+        sapp_rpm_file: "sapp-4.0.7.f31c99c-1.el7.x86_64.rpm"
\ No newline at end of file