From 8ec69829af41ff007ca8d917914ef12fd6bfdbba Mon Sep 17 00:00:00 2001 From: fumingwei Date: Tue, 21 Nov 2023 23:41:37 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=E4=BF=AE=E6=94=B9stellar-c=E5=92=8Cfire?= =?UTF-8?q?wall=20rpm=20prefix=E4=B8=BA/opt/tsg/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/install_config/group_vars/rpm_version.yml | 1 + ansible/roles/firewall/tasks/main.yml | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index 075ce397..afe04d16 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -28,6 +28,7 @@ firewall_rpm_version: session_flags: session_flags-2.2.2.8817a79 stat_policy_enforcer: stat_policy_enforcer-3.1.2.e0eaa81 sf_classifier: sf_classifier-1.0.6.a4f06b3 + stellar-c: stellar-c-1.0.3.87626a3 framework_rpm_version: 00_libcjson: libcjson-1.7.12.6c09dcf diff --git a/ansible/roles/firewall/tasks/main.yml b/ansible/roles/firewall/tasks/main.yml index f13e1bea..ee1e65ab 100644 --- a/ansible/roles/firewall/tasks/main.yml +++ b/ansible/roles/firewall/tasks/main.yml @@ -9,8 +9,17 @@ with_dict: "{{ firewall_rpm_version }}" - name: "Install firwall that are sapp plugins" - shell: rpm -i /tmp/rpm_download/{{ item.value }}* --prefix {{ prefix_path.sapp }} - with_dict: "{{ firewall_rpm_version }}" + shell: rpm -i /tmp/rpm_download/{{ item.1 }}* --prefix {{ prefix_path.sapp }} + when: + - item.1 is not search("stellar-c") + - item.1 is not search("firewall") + loop: "{{ firewall_rpm_version }}" + +- name: "Install firwall and stellar-c rpm plugins" + shell: rpm -i /tmp/rpm_download/{{ item }}* --prefix /opt/tsg/ + with_items: + - "{{ firewall_rpm_version['stellar-c'] }}" + - "{{ firewall_rpm_version['firewall'] }}" - name: "Template the tsgconf/main.conf" template: