20.05.01

27 files changed, 40 insertions, 11 deletions

diff --git a/deploy.yml b/deploy.yml
index fdb3387..92a4304 100644
--- a/deploy.yml
+++ b/deploy.yml
@@ -8,6 +8,7 @@
 #    - tsg-env-mcn0
     - mrzcpd
     - sapp
+    - tsg_master
     - kni
     - firewall
     - http_healthcheck
@@ -44,6 +45,7 @@
     - mrzcpd
     - tsg-env-tun-mode
     - sapp
+    - tsg_master
     - kni
     - firewall
     - http_healthcheck
diff --git a/roles/certstore/files/certstore-v20.04.3989072-1.el7.x86_64.rpm b/roles/certstore/files/certstore-v20.04.3989072-1.el7.x86_64.rpm
deleted file mode 100644
index 9061d15..0000000
--- a/roles/certstore/files/certstore-v20.04.3989072-1.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/certstore/files/certstore-v20.05.0f61dde-1.el7.centos.x86_64.rpm b/roles/certstore/files/certstore-v20.05.0f61dde-1.el7.centos.x86_64.rpm
new file mode 100644
index 0000000..dfc75d4
--- /dev/null
+++ b/roles/certstore/files/certstore-v20.05.0f61dde-1.el7.centos.x86_64.rpm
diff --git a/roles/certstore/tasks/main.yml b/roles/certstore/tasks/main.yml
index 69cc9c2..8115bfa 100644
--- a/roles/certstore/tasks/main.yml
+++ b/roles/certstore/tasks/main.yml
@@ -10,7 +10,7 @@
 - name: install certstore
   yum:
     name:
-      - /tmp/ansible_deploy/certstore-v20.04.3989072-1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/certstore-v20.05.0f61dde-1.el7.centos.x86_64.rpm
     state: present
 
 - name: template certstore configure file
diff --git a/roles/certstore/templates/cert_store.ini.j2 b/roles/certstore/templates/cert_store.ini.j2
index 0a30c8c..68de7bf 100644
--- a/roles/certstore/templates/cert_store.ini.j2
+++ b/roles/certstore/templates/cert_store.ini.j2
@@ -15,7 +15,7 @@ expire_after = 30
 local_debug = 1
 ca_path = ./cert/tango-ca-v3-trust-ca.pem
 untrusted_ca_path = ./cert/mesalab-ca-untrust.pem
-[NTC_MAAT]
+[MAAT]
 #Configure the load mode,
 #0: using the configuration distribution network
 #1: using local json
@@ -43,3 +43,6 @@ port = 6379
 ip = {{ maat_redis_server.address }}
 port = {{ maat_redis_server.port }}
 dbindex =  {{ maat_redis_server.db }}
+[stat]
+statsd_server=192.168.100.1
+statsd_port=8126
diff --git a/roles/firewall/files/ftp-1.0.4.5d3a283-2.el7.x86_64.rpm b/roles/firewall/files/ftp-1.0.4.5d3a283-2.el7.x86_64.rpm
index e0f5a90..e0f5a90 100644..100755
--- a/roles/firewall/files/ftp-1.0.4.5d3a283-2.el7.x86_64.rpm
+++ b/roles/firewall/files/ftp-1.0.4.5d3a283-2.el7.x86_64.rpm
diff --git a/roles/firewall/files/fw_ftp_plug-1.0.3.73372b5-2.el7.x86_64.rpm b/roles/firewall/files/fw_ftp_plug-1.0.3.73372b5-2.el7.x86_64.rpm
deleted file mode 100644
index 056e182..0000000
--- a/roles/firewall/files/fw_ftp_plug-1.0.3.73372b5-2.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/firewall/files/fw_ftp_plug-1.0.4.4a87a1e-2.el7.x86_64.rpm b/roles/firewall/files/fw_ftp_plug-1.0.4.4a87a1e-2.el7.x86_64.rpm
new file mode 100644
index 0000000..b86612a
--- /dev/null
+++ b/roles/firewall/files/fw_ftp_plug-1.0.4.4a87a1e-2.el7.x86_64.rpm
diff --git a/roles/firewall/files/fw_http_plug-1.0.14.2f3b011-2.el7.x86_64.rpm b/roles/firewall/files/fw_http_plug-1.0.14.2f3b011-2.el7.x86_64.rpm
deleted file mode 100644
index 54bae55..0000000
--- a/roles/firewall/files/fw_http_plug-1.0.14.2f3b011-2.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/firewall/files/fw_http_plug-debuginfo-1.0.15.9cf2c79-2.el7.x86_64.rpm b/roles/firewall/files/fw_http_plug-debuginfo-1.0.15.9cf2c79-2.el7.x86_64.rpm
new file mode 100755
index 0000000..d49e501
--- /dev/null
+++ b/roles/firewall/files/fw_http_plug-debuginfo-1.0.15.9cf2c79-2.el7.x86_64.rpm
diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml
index f4a6b39..acafa78 100644
--- a/roles/firewall/tasks/main.yml
+++ b/roles/firewall/tasks/main.yml
@@ -17,10 +17,10 @@
       - /tmp/ansible_deploy/ssl-1.0.0.73e5273-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/tsg_conn_record-1.0.0.2155660-1.el7.centos.x86_64.rpm
       - /tmp/ansible_deploy/fw_dns_plug-debug-1.0.3.ea8e0f6-1.el7.centos.x86_64.rpm
-      - /tmp/ansible_deploy/fw_ftp_plug-1.0.3.73372b5-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/fw_ftp_plug-1.0.4.4a87a1e-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/fw_ssl_plug-1.0.3.30fcf35-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/fw_mail_plug-1.0.4.03e1b53-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/fw_http_plug-1.0.14.2f3b011-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/fw_http_plug-debuginfo-1.0.15.9cf2c79-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/capture_packet_plug-debug-1.0.0.-1.el7.x86_64.rpm
       - /tmp/ansible_deploy/clotho-debug-1.0.0.-1.el7.x86_64.rpm
 
diff --git a/roles/kni/files/kni-20.04-1.el7.x86_64.rpm b/roles/kni/files/kni-20.04-1.el7.x86_64.rpm
deleted file mode 100644
index 197bebe..0000000
--- a/roles/kni/files/kni-20.04-1.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/kni/files/kni-20.05.01.7886a74-1.el7.x86_64.rpm b/roles/kni/files/kni-20.05.01.7886a74-1.el7.x86_64.rpm
new file mode 100755
index 0000000..9f674d3
--- /dev/null
+++ b/roles/kni/files/kni-20.05.01.7886a74-1.el7.x86_64.rpm
diff --git a/roles/kni/tasks/main.yml b/roles/kni/tasks/main.yml
index 2d6c8bd..7c07946 100644
--- a/roles/kni/tasks/main.yml
+++ b/roles/kni/tasks/main.yml
@@ -7,7 +7,7 @@
 - name: "install kni rpms from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/kni-20.04-1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/kni-20.05.01.7886a74-1.el7.x86_64.rpm
     state: present
 
 - name: Template the kni.conf
diff --git a/roles/sapp/files/tsg_master-1.0.6.7c22c8d-2.el7.x86_64.rpm b/roles/sapp/files/tsg_master-1.0.6.7c22c8d-2.el7.x86_64.rpm
deleted file mode 100644
index 27d8e69..0000000
--- a/roles/sapp/files/tsg_master-1.0.6.7c22c8d-2.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/sapp/tasks/main.yml b/roles/sapp/tasks/main.yml
index 6bcd967..7f76b3a 100644
--- a/roles/sapp/tasks/main.yml
+++ b/roles/sapp/tasks/main.yml
@@ -7,7 +7,6 @@
 - name: "install sapp rpms from localhost"
   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
diff --git a/roles/telegraf/files/telegraf-1.13.0-1.x86_64.rpm b/roles/telegraf/files/telegraf-1.13.0-1.x86_64.rpm
new file mode 100644
index 0000000..0bb3681
--- /dev/null
+++ b/roles/telegraf/files/telegraf-1.13.0-1.x86_64.rpm
diff --git a/roles/telegraf/tasks/main.yml b/roles/telegraf/tasks/main.yml
new file mode 100644
index 0000000..973e80f
--- /dev/null
+++ b/roles/telegraf/tasks/main.yml
@@ -0,0 +1,22 @@
+- name: "copy telegraf.rpm to destination server"
+  copy:
+    src: "{{ role_path }}/files/"
+    dest: /tmp
+
+- name: "install telegraf"
+  yum:
+    name:
+      - /tmp/telegraf-1.13.0-1.x86_64.rpm
+    state: present
+
+- name: "Templates telegraf.conf"
+  template:
+    src: "{{role_path}}/templates/telegraf.conf.j2"
+    dest: /etc/telegraf/telegraf.conf
+  tags: template
+
+- name: "Start telegraf"
+  systemd:
+    name: telegraf.service
+    state: restarted
+    enabled: yes
diff --git a/roles/tfe/files/tfe-4.3.2.374930d-1.el7.x86_64.rpm b/roles/tfe/files/tfe-4.3.2.374930d-1.el7.x86_64.rpm
deleted file mode 100755
index fbf2b90..0000000
--- a/roles/tfe/files/tfe-4.3.2.374930d-1.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/tfe/files/tfe-4.3.3.05c7528-1.el7.x86_64.rpm b/roles/tfe/files/tfe-4.3.3.05c7528-1.el7.x86_64.rpm
new file mode 100755
index 0000000..66bfb67
--- /dev/null
+++ b/roles/tfe/files/tfe-4.3.3.05c7528-1.el7.x86_64.rpm
diff --git a/roles/tfe/tasks/main.yml b/roles/tfe/tasks/main.yml
index 9b0552b..d78ef5f 100644
--- a/roles/tfe/tasks/main.yml
+++ b/roles/tfe/tasks/main.yml
@@ -8,7 +8,7 @@
   yum:
     name:
       - /tmp/ansible_deploy/tfe-kmod-v1.0.5.20200408-1dkms.noarch.rpm
-      - /tmp/ansible_deploy/tfe-4.3.2.374930d-1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tfe-4.3.3.05c7528-1.el7.x86_64.rpm
     state: present
 
 - name: "template tfe-env config"
diff --git a/roles/tfe/templates/pangu_pxy.conf.j2 b/roles/tfe/templates/pangu_pxy.conf.j2
index 35730c0..eb279b2 100644
--- a/roles/tfe/templates/pangu_pxy.conf.j2
+++ b/roles/tfe/templates/pangu_pxy.conf.j2
@@ -8,6 +8,7 @@ nic_name={{ tsg_tun_mode.ethname }}
 nic_name={{ nic_mgr.name }}

 {% endif %}

 entrance_id=0

+device_id_filepath=/opt/tsg/etc/tsg_sn.json

 kafka_brokerlist= {{ log_kafkabrokers.address }}

 kafka_topic=PROXY-EVENT-LOG

 

diff --git a/roles/tfe/templates/tfe-env-config.j2 b/roles/tfe/templates/tfe-env-config.j2
index edc4dd0..700742b 100644
--- a/roles/tfe/templates/tfe-env-config.j2
+++ b/roles/tfe/templates/tfe-env-config.j2
@@ -1,5 +1,5 @@
 {% if tsg_access_type == 0 %}
-TFE_DEVICE_DATA_INCOMING={{ tsg_tun_mode.tun_name }}
+TFE_DEVICE_DATA_INCOMING=tun_kni
 {% else %}
 TFE_DEVICE_DATA_INCOMING={{ nic_data_incoming.name }}
 {% endif %}
diff --git a/roles/tfe/templates/tfe.conf.j2 b/roles/tfe/templates/tfe.conf.j2
index b009909..5dfe34d 100644
--- a/roles/tfe/templates/tfe.conf.j2
+++ b/roles/tfe/templates/tfe.conf.j2
@@ -50,6 +50,7 @@ cert_store_host= {{ cert_store_server.address }}
 cert_store_port= {{ cert_store_server.port }}
 ca_path=resource/tfe/tango-ca-v3-trust-ca.pem
 untrusted_ca_path=resource/tfe/tango-ca-v3-untrust-ca.pem
+enable_health_check=0
 
 [debug]	
 passthrough_all_tcp=0
@@ -78,11 +79,11 @@ tcp_ttl_upstream=75
 tcp_ttl_downstream=70
 
 [log]
-level=30
+level=10
 
 [stat]
 statsd_server={{ fs_remote.address }}
 statsd_port={{ fs_remote.port }}
 
 [http]
-loglevel=30
+loglevel=10
diff --git a/roles/tsg_master/files/tsg_master-1.0.10.7a0cd47-2.el7.x86_64.rpm b/roles/tsg_master/files/tsg_master-1.0.10.7a0cd47-2.el7.x86_64.rpm
new file mode 100644
index 0000000..2691764
--- /dev/null
+++ b/roles/tsg_master/files/tsg_master-1.0.10.7a0cd47-2.el7.x86_64.rpm
diff --git a/roles/tsg_master/files/tsg_master-debug-1.0.3.a4e2a7c-1.el7.centos.x86_64.rpm b/roles/tsg_master/files/tsg_master-debug-1.0.3.a4e2a7c-1.el7.centos.x86_64.rpm
deleted file mode 100644
index b81cfd6..0000000
--- a/roles/tsg_master/files/tsg_master-debug-1.0.3.a4e2a7c-1.el7.centos.x86_64.rpm
+++ /dev/null
diff --git a/roles/tsg_master/tasks/main.yml b/roles/tsg_master/tasks/main.yml
index 5c57052..0eac3d4 100644
--- a/roles/tsg_master/tasks/main.yml
+++ b/roles/tsg_master/tasks/main.yml
@@ -6,5 +6,6 @@
 - name: "install tsg_master from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/tsg_master-debug-1.0.3.a4e2a7c-1.el7.centos.x86_64.rpm
+      - /tmp/ansible_deploy/tsg_master-1.0.10.7a0cd47-2.el7.x86_64.rpm
     state: present
+    skip_broken: yes