diff --git a/install_config/hosts b/install_config/hosts index 2ee4e69..90aab45 100644 --- a/install_config/hosts +++ b/install_config/hosts @@ -5,19 +5,19 @@ package_source=local [pc-as-tun-mode] [blade-mxn] -192.168.40.170 +1.1.1.1 device_id=1 [blade-00] -192.168.40.166 vvipv4_1= vvipv4_2= vvipv6_1= vvipv6_2= +1.1.1.1 device_id=1 vvipv4_1= vvipv4_2= vvipv6_1= vvipv6_2= [blade-01] -192.168.40.167 +1.1.1.1 device_id=1 [blade-02] -192.168.40.168 +1.1.1.1 device_id=1 [blade-03] -192.168.40.169 +1.1.1.1 device_id=1 [Functional_Host:children] blade-00 diff --git a/roles/certstore/files/certstore-2.1.2.20200728.7515a19-1.el7.x86_64.rpm b/roles/certstore/files/certstore-2.1.2.20200728.7515a19-1.el7.x86_64.rpm new file mode 100644 index 0000000..aaecaa9 Binary files /dev/null and b/roles/certstore/files/certstore-2.1.2.20200728.7515a19-1.el7.x86_64.rpm differ 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 deleted file mode 100644 index dfc75d4..0000000 Binary files a/roles/certstore/files/certstore-v20.05.0f61dde-1.el7.centos.x86_64.rpm and /dev/null differ diff --git a/roles/certstore/tasks/main.yml b/roles/certstore/tasks/main.yml index 8115bfa..b322fea 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.05.0f61dde-1.el7.centos.x86_64.rpm + - /tmp/ansible_deploy/certstore-2.1.2.20200728.7515a19-1.el7.x86_64.rpm state: present - name: template certstore configure file diff --git a/roles/firewall/files/fw_ssl_plug-3.0.0.3a29c3f-2.el7.x86_64.rpm b/roles/firewall/files/fw_ssl_plug-3.0.0.3a29c3f-2.el7.x86_64.rpm deleted file mode 100644 index 830c3e4..0000000 Binary files a/roles/firewall/files/fw_ssl_plug-3.0.0.3a29c3f-2.el7.x86_64.rpm and /dev/null differ diff --git a/roles/firewall/files/fw_ssl_plug-3.0.1.7ea9976-2.el7.x86_64.rpm b/roles/firewall/files/fw_ssl_plug-3.0.1.7ea9976-2.el7.x86_64.rpm new file mode 100644 index 0000000..79c9258 Binary files /dev/null and b/roles/firewall/files/fw_ssl_plug-3.0.1.7ea9976-2.el7.x86_64.rpm differ diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml index c2c86eb..7144fe8 100644 --- a/roles/firewall/tasks/main.yml +++ b/roles/firewall/tasks/main.yml @@ -20,7 +20,7 @@ - /tmp/ansible_deploy/fw_http_plug-3.0.0.1ca1c65-2.el7.x86_64.rpm - /tmp/ansible_deploy/fw_mail_plug-3.0.0.3b4e481-2.el7.x86_64.rpm - /tmp/ansible_deploy/fw_quic_plug-3.0.0.b06d39c-2.el7.x86_64.rpm - - /tmp/ansible_deploy/fw_ssl_plug-3.0.0.3a29c3f-2.el7.x86_64.rpm + - /tmp/ansible_deploy/fw_ssl_plug-3.0.1.7ea9976-2.el7.x86_64.rpm - /tmp/ansible_deploy/http-2.0.3.9218b4b-2.el7.x86_64.rpm - /tmp/ansible_deploy/mail-1.0.7.9e3be05-2.el7.x86_64.rpm - /tmp/ansible_deploy/quic-1.1.6.d6755d8-2.el7.x86_64.rpm diff --git a/roles/tfe/templates/tfe.conf.j2 b/roles/tfe/templates/tfe.conf.j2 index cafdcc8..fc38c69 100644 --- a/roles/tfe/templates/tfe.conf.j2 +++ b/roles/tfe/templates/tfe.conf.j2 @@ -119,6 +119,7 @@ maat_redis_port_range={{ maat_redis_server.port }} maat_redis_db_index={{ maat_redis_server.db }} effect_interval_s=1 #accept_tags={"tags":[{"tag":"location","value":"Astana"}]} +accept_path=/opt/tsg/etc/tsg_device_tag.json [dynamic_maat] maat_input_mode=1 diff --git a/roles/tsg_device_tag/tasks/main.yml b/roles/tsg_device_tag/tasks/main.yml new file mode 100644 index 0000000..ebe91d2 --- /dev/null +++ b/roles/tsg_device_tag/tasks/main.yml @@ -0,0 +1,9 @@ +- name: "create /opt/tsg/etc/" + file: + path: /opt/proxy_status + state: directory + +- name: "Template tsg_device_tag.json" + template: + src: "{{ role_path }}/templates/tsg_device_tag.json.j2" + dest: /opt/tsg/etc/tsg_device_tag.json diff --git a/roles/tsg_device_tag/templates/tsg_device_tag.json.j2 b/roles/tsg_device_tag/templates/tsg_device_tag.json.j2 new file mode 100644 index 0000000..de84658 --- /dev/null +++ b/roles/tsg_device_tag/templates/tsg_device_tag.json.j2 @@ -0,0 +1,2 @@ +[MAAT] +ACCEPT_TAGS={"tags":[{"tag":"device_id","value":"{{ device_id }}"}]} diff --git a/roles/tsg_master/files/tsg_master-3.0.3.3c9cf15-2.el7.x86_64.rpm b/roles/tsg_master/files/tsg_master-3.0.3.3c9cf15-2.el7.x86_64.rpm deleted file mode 100644 index 5322b69..0000000 Binary files a/roles/tsg_master/files/tsg_master-3.0.3.3c9cf15-2.el7.x86_64.rpm and /dev/null differ diff --git a/roles/tsg_master/files/tsg_master-3.0.4.40fa047-2.el7.x86_64.rpm b/roles/tsg_master/files/tsg_master-3.0.4.40fa047-2.el7.x86_64.rpm new file mode 100644 index 0000000..0a46aef Binary files /dev/null and b/roles/tsg_master/files/tsg_master-3.0.4.40fa047-2.el7.x86_64.rpm differ diff --git a/roles/tsg_master/tasks/main.yml b/roles/tsg_master/tasks/main.yml index ef33686..f49ce64 100644 --- a/roles/tsg_master/tasks/main.yml +++ b/roles/tsg_master/tasks/main.yml @@ -6,6 +6,6 @@ - name: "install tsg_master from localhost" yum: name: - - /tmp/ansible_deploy/tsg_master-3.0.3.3c9cf15-2.el7.x86_64.rpm + - /tmp/ansible_deploy/tsg_master-3.0.4.40fa047-2.el7.x86_64.rpm state: present skip_broken: yes