20200522tsg-version20.5-deploy

7 files changed, 17 insertions, 21 deletions

diff --git a/install_config/group_vars/all.yml b/install_config/group_vars/all.yml
index 728f292..fce91b7 100644
--- a/install_config/group_vars/all.yml
+++ b/install_config/group_vars/all.yml
@@ -71,6 +71,6 @@ mrtunnat:
 tsg_tun_mode:
   ethname: eth0
   tun_name: eth0.100
-  internel_interface: "eth2"
+  internal_interface: "eth2"
   external_interface: "eth3"
 
diff --git a/roles/clotho/templates/clotho.conf.j2 b/roles/clotho/templates/clotho.conf.j2
index 0638aa3..00d2316 100644
--- a/roles/clotho/templates/clotho.conf.j2
+++ b/roles/clotho/templates/clotho.conf.j2
@@ -2,7 +2,7 @@
 BROKER_LIST={{ log_kafkabrokers.address }}
 
 [SYSTEM]
-{% if tsg_access_typ == 0 %}
+{% if tsg_access_type == 0 %}
 NIC_NAME={{ tsg_tun_mode.ethname }}
 {% else %}
 NIC_NAME={{ nic_mgr.name }}
diff --git a/roles/framework/files/lz4-1.7.5-3.el7.x86_64.rpm b/roles/framework/files/lz4-1.7.5-3.el7.x86_64.rpm
new file mode 100644
index 0000000..07035f1
--- /dev/null
+++ b/roles/framework/files/lz4-1.7.5-3.el7.x86_64.rpm
diff --git a/roles/framework/tasks/main.yml b/roles/framework/tasks/main.yml
index 4a09d50..e4c815a 100644
--- a/roles/framework/tasks/main.yml
+++ b/roles/framework/tasks/main.yml
@@ -7,6 +7,7 @@
   yum:
     name: "{{ packages }}"
     state: present
+    skip_broken: yes
   vars:
     packages:
       - /tmp/ansible_deploy/libMESA_field_stat-1.0.1.852c2df-1.el7.x86_64.rpm
@@ -20,6 +21,7 @@
       - /tmp/ansible_deploy/libmaatframe-2.8.1.8729ebf-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/librulescan-2.1.7.c27f70d-1.el7.x86_64.rpm
       - /tmp/ansible_deploy/libwiredcfg-2.0.2.7ce1eea-1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/lz4-1.7.5-3.el7.x86_64.rpm
       - /tmp/ansible_deploy/librdkafka-0.11.4-1.el7.x86_64.rpm
 
 - name: "mkdir /etc/ld.so.conf.d/"
@@ -28,8 +30,9 @@
     state: directory
 
 - name: "copy framework.conf to destination server"
-  copy: "{{ role_path }}/files/framework.conf"
-  dest: /etc/ld.so.conf.d/
+  copy:
+    src: "{{ role_path }}/files/framework.conf"
+    dest: /etc/ld.so.conf.d/
 
 - name: "update ld"
   command: ldconfig
diff --git a/roles/sapp/tasks/main.yml b/roles/sapp/tasks/main.yml
index edbdf8c..6bcd967 100644
--- a/roles/sapp/tasks/main.yml
+++ b/roles/sapp/tasks/main.yml
@@ -8,18 +8,11 @@
   yum:
     name:
       - /tmp/ansible_deploy/tsg_master-1.0.6.7c22c8d-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/sapp-4.0.12.f8435d8-x86_64.rpm
     state: present
+    skip_broken: yes
 
-- name: "judge sapp"
-  shell: rpm -qa |grep sapp
-  register: return
-  ignore_errors: true
-
-- name: "install sapp rpms from localhost"
-  shell: cd /tmp/ansible_deploy;rpm -ivh sapp-4.0.12.f8435d8-x86_64.rpm
-  when: return.rc != 0
-
-- name: make dir
+- name: "mkdir tsgconf"
   file:
     path: /home/mesasoft/sapp_run/tsgconf
     state: directory
diff --git a/roles/sapp/templates/sapp.toml.j2 b/roles/sapp/templates/sapp.toml.j2
index 028ad13..d8c18e4 100644
--- a/roles/sapp/templates/sapp.toml.j2
+++ b/roles/sapp/templates/sapp.toml.j2
@@ -37,7 +37,7 @@ BSD_packet_filter=""
     [packet_io.internal.interface]
     {% if tsg_access_type == 0 %}
     type=pcap
-    name={{tsg_tun_mode.internel_interface}}
+    name={{tsg_tun_mode.internal_interface}}
     {% else %}
     type=marsio
     name=vxlan_user
diff --git a/roles/tsg-env-tun-mode/templates/setup.j2 b/roles/tsg-env-tun-mode/templates/setup.j2
index 0d26092..179a4f5 100644
--- a/roles/tsg-env-tun-mode/templates/setup.j2
+++ b/roles/tsg-env-tun-mode/templates/setup.j2
@@ -3,9 +3,9 @@ modprobe 8021q
 vconfig add {{ tsg_tun_mode.ethname }} 100
 vconfig set_flag {{ tsg_tun_mode.ethname }}.100 1 1
 ifconfig {{ tsg_tun_mode.ethname }}.100 192.168.100.1 netmask 255.255.255.0 up
-ethtool -K {{ tsg_tun_mode.internel_interface }} tso off
-ethtool -K {{ tsg_tun_mode.internel_interface }} gso off
-ethtool -K {{ tsg_tun_mode.internel_interface }} gro off
-ethtool -K {{ tsg_tun_mode.externel_interface }} tso off
-ethtool -K {{ tsg_tun_mode.externel_interface }} gso off
-ethtool -K {{ tsg_tun_mode.externel_interface }} gro off
+ethtool -K {{ tsg_tun_mode.internal_interface }} tso off
+ethtool -K {{ tsg_tun_mode.internal_interface }} gso off
+ethtool -K {{ tsg_tun_mode.internal_interface }} gro off
+ethtool -K {{ tsg_tun_mode.external_interface }} tso off
+ethtool -K {{ tsg_tun_mode.external_interface }} gso off
+ethtool -K {{ tsg_tun_mode.external_interface }} gro off