diff --git a/deploy.yml b/deploy.yml index b924829..fdb3387 100644 --- a/deploy.yml +++ b/deploy.yml @@ -5,7 +5,7 @@ - hosts: blade-00 roles: - - tsg-env-mcn0 +# - tsg-env-mcn0 - mrzcpd - sapp - kni @@ -17,25 +17,25 @@ - hosts: blade-01 roles: - - tsg-env-mcn1 +# - tsg-env-mcn1 - mrzcpd - tfe - hosts: blade-02 roles: - - tsg-env-mcn2 +# - tsg-env-mcn2 - mrzcpd - tfe - hosts: blade-03 roles: - - tsg-env-mcn3 +# - tsg-env-mcn3 - mrzcpd - tfe - hosts: blade-mxn roles: - - tsg-env-mxn +# - tsg-env-mxn - hosts: pc-as-tun-mode roles: diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml index 4622349..4777c91 100644 --- a/roles/firewall/tasks/main.yml +++ b/roles/firewall/tasks/main.yml @@ -11,14 +11,14 @@ vars: fw_packages: - /tmp/ansible_deploy/dns-debug-1.0.0.-1.el7.x86_64.rpm - - /tmp/ansible_deploy/ftp-debug-1.0.0.-1.el7.x86_64.rpm + - /tmp/ansible_deploy/ftp-debug-1.0.2.1cddd55-1.el7.centos.x86_64.rpm - /tmp/ansible_deploy/http-debug-1.0.0.-1.el7.x86_64.rpm - /tmp/ansible_deploy/mail-debug-1.0.0.-1.el7.x86_64.rpm - /tmp/ansible_deploy/ssl-debug-1.0.0.-1.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-debug-1.0.1.a5c1e05-1.el7.centos.x86_64.rpm - - /tmp/ansible_deploy/fw_http_plug-debug-1.0.6.7b34485-1.el7.centos.x86_64.rpm + - /tmp/ansible_deploy/fw_http_plug-debug-1.0.8.620f455-1.el7.centos.x86_64.rpm - /tmp/ansible_deploy/fw_mail_plug-debug-1.0.2.f513698-1.el7.centos.x86_64.rpm - /tmp/ansible_deploy/fw_ssl_plug-1.0.1.d232f96-1.el7.centos.x86_64.rpm - /tmp/ansible_deploy/capture_packet_plug-debug-1.0.0.-1.el7.x86_64.rpm diff --git a/roles/sapp/tasks/main.yml b/roles/sapp/tasks/main.yml index 1f92210..3bfba39 100644 --- a/roles/sapp/tasks/main.yml +++ b/roles/sapp/tasks/main.yml @@ -7,10 +7,19 @@ - name: "install sapp rpms from localhost" yum: name: - - /tmp/ansible_deploy/sapp-4.0.11.347f7b7-x86_64.rpm + # - /tmp/ansible_deploy/sapp-4.0.11.347f7b7-x86_64.rpm - /tmp/ansible_deploy/tsg_master-debug-1.0.3.a4e2a7c-1.el7.centos.x86_64.rpm state: present +- 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.11.347f7b7-x86_64.rpm --nodeps + when: return.rc != 0 + - name: make dir file: path: /home/mesasoft/sapp_run/tsgconf