From 8825cb5cbfd1c7eb0fdeb6e977599402eb55fcad Mon Sep 17 00:00:00 2001 From: fumingwei Date: Tue, 13 Sep 2022 11:41:02 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=E4=BF=AE=E5=A4=8D=E5=9B=A0=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E9=A1=BA=E5=BA=8F=E9=94=99=E8=AF=AF=E5=AF=BC=E8=87=B4?= =?UTF-8?q?framework=E5=AE=89=E8=A3=85=E5=A4=B1=E8=B4=A5=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../install_config/group_vars/rpm_version.yml | 34 +++++++++---------- ansible/roles/framework/tasks/main.yml | 8 ++--- ansible/roles/rpm_download/tasks/main.yml | 4 +-- ansible/roles/rpm_uninstall/tasks/main.yml | 10 +++--- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index 5d26fc8c..6458cc92 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -37,23 +37,23 @@ firewall_rpm_version: bgp: bgp-1.1.0.ec59191 framework_rpm_version: - libcjson: libcjson-1.7.12.6c09dcf - libdocumentanalyze: libdocumentanalyze-2.0.10.4c04402 - libMESA_field_stat: libMESA_field_stat-1.0.3.0de785d - libMESA_field_stat2: libMESA_field_stat2-2.10.11.b2095aa - libMESA_handle_logger: libMESA_handle_logger-2.0.9.b677bb6 - libMESA_htable: libMESA_htable-3.10.13.bd6fc34 - libMESA_prof_load: libMESA_prof_load-1.0.9.16148e7 - librulescan: librulescan-2.3.1.b3a667a - libelua: libelua-2.0.0.ca53d85 - libwiredcfg: libwiredcfg-2.0.8.cafaf49 - libWiredLB: libWiredLB-2.0.6.54a039d - libbreakpad_mini: libbreakpad_mini-1.0.9.9d98968 - libhos-client-cpp: libhos-client-cpp-3.0.13.8108a5e - libMV_Sketch: libMV_Sketch-2.1.2.20220225.dc6bb95 - librdkafka: librdkafka-1.2.2.1218b3c - libMESA_jump_layer: libMESA_jump_layer-1.0.10.6fb4738 - libmaatframe: libmaatframe-3.6.11.47a7101 + 00_libcjson: libcjson-1.7.12.6c09dcf + 01_libdocumentanalyze: libdocumentanalyze-2.0.10.4c04402 + 02_libMESA_field_stat: libMESA_field_stat-1.0.3.0de785d + 03_libMESA_field_stat2: libMESA_field_stat2-2.10.11.b2095aa + 04_libMESA_handle_logger: libMESA_handle_logger-2.0.9.b677bb6 + 05_libMESA_htable: libMESA_htable-3.10.13.bd6fc34 + 06_libMESA_prof_load: libMESA_prof_load-1.0.9.16148e7 + 07_librulescan: librulescan-2.3.1.b3a667a + 08_libelua: libelua-2.0.0.ca53d85 + 09_libwiredcfg: libwiredcfg-2.0.8.cafaf49 + 10_libWiredLB: libWiredLB-2.0.6.54a039d + 11_libbreakpad_mini: libbreakpad_mini-1.0.9.9d98968 + 12_libhos-client-cpp: libhos-client-cpp-3.0.13.8108a5e + 13_libMV_Sketch: libMV_Sketch-2.1.2.20220225.dc6bb95 + 14_librdkafka: librdkafka-1.2.2.1218b3c + 15_libMESA_jump_layer: libMESA_jump_layer-1.0.10.6fb4738 + 16_libmaatframe: libmaatframe-3.6.11.47a7101 kni_rpm_version: kni: kni-5.0.2.6cb27c3 diff --git a/ansible/roles/framework/tasks/main.yml b/ansible/roles/framework/tasks/main.yml index ce577084..7e993fad 100644 --- a/ansible/roles/framework/tasks/main.yml +++ b/ansible/roles/framework/tasks/main.yml @@ -13,16 +13,16 @@ - name: "download rpm packages: framework" yum: - name: "{{ item.value }}" + name: "{{ item.1 }}" state: present conf_file: "{{ rpm_repo_config_path }}" download_only: yes download_dir: "{{ path_download }}" - with_dict: "{{ framework_rpm_version }}" + loop: "{{ framework_rpm_version | dictsort }}" - name: "Install frameworks" - shell: rpm -i /tmp/rpm_download/{{ item.value }}* --prefix {{ prefix_path.framework }} - with_dict: "{{ framework_rpm_version }}" + shell: rpm -i /tmp/rpm_download/{{ item.1 }}* --prefix {{ prefix_path.framework }} + loop: "{{ framework_rpm_version | dictsort }}" - name: "mkdir /etc/ld.so.conf.d/" file: diff --git a/ansible/roles/rpm_download/tasks/main.yml b/ansible/roles/rpm_download/tasks/main.yml index f907f20c..cc991828 100644 --- a/ansible/roles/rpm_download/tasks/main.yml +++ b/ansible/roles/rpm_download/tasks/main.yml @@ -27,12 +27,12 @@ - name: "download rpm packages: framework" yum: - name: "{{ item.value }}" + name: "{{ item.1 }}" state: present conf_file: "{{ rpm_repo_config_path }}" download_only: yes download_dir: "{{ path_download }}" - with_dict: "{{ framework_rpm_version }}" + loop: "{{ framework_rpm_version | dictsort }}" - name: "download rpm packages: kni" yum: diff --git a/ansible/roles/rpm_uninstall/tasks/main.yml b/ansible/roles/rpm_uninstall/tasks/main.yml index b27dd8ba..da3656bf 100644 --- a/ansible/roles/rpm_uninstall/tasks/main.yml +++ b/ansible/roles/rpm_uninstall/tasks/main.yml @@ -11,11 +11,11 @@ state: absent with_dict: "{{ firewall_rpm_version }}" -- name: "uninstall framework" - yum: - name: "{{ item.key }}" - state: absent - with_dict: "{{ framework_rpm_version }}" +#- name: "uninstall framework" +# yum: +# name: "{{ item.key }}" +# state: absent +# with_dict: "{{ framework_rpm_version }}" - name: "uninstall kni" yum: