Stop using loops for package-related tasks

This is slower and will be deprecated in a future version of Ansible

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/roles/cobbler/tasks/apt_systems.yml b/roles/cobbler/tasks/apt_systems.yml
index 7260d2002cd47a1f52e3d44b029d4ceff0593943..037e32dee335f1fecbb9cf2f2a09528e90557e01 100644 (file)
--- a/roles/cobbler/tasks/apt_systems.yml
+++ b/roles/cobbler/tasks/apt_systems.yml
@@ -7,7 +7,6 @@
 
 - name: Install extra cobbler packages
   apt:
-    name: "{{ item }}"
+    name: "{{ cobbler_extra_packages|list }}"
     state: latest
-  with_items: "{{ cobbler_extra_packages }}"
   when: cobbler_extra_packages|length > 0

diff --git a/roles/cobbler/tasks/pip.yml b/roles/cobbler/tasks/pip.yml
index b0655e3081db042fd4da37bec461c7ecef1b482e..19b77f028928b8e3ef6a78f44ae2ba244b044d1a 100644 (file)
--- a/roles/cobbler/tasks/pip.yml
+++ b/roles/cobbler/tasks/pip.yml
@@ -1,6 +1,5 @@
 ---
 - name: Install pip packages
   pip:
-    name: "{{ item }}"
+    name: "{{ pip_packages|list }}"
     state: latest
-  with_items: "{{ pip_packages }}"

diff --git a/roles/cobbler/tasks/yum_systems.yml b/roles/cobbler/tasks/yum_systems.yml
index 6d99759c4c5814c1a9cab70061d07e53b5bc71aa..2c8ff95043333991cb408bf0e560ff18cd7f0139 100644 (file)
--- a/roles/cobbler/tasks/yum_systems.yml
+++ b/roles/cobbler/tasks/yum_systems.yml
@@ -7,9 +7,8 @@
 
 - name: Install extra cobbler packages
   yum:
-    name: "{{ item }}"
+    name: "{{ cobbler_extra_packages|list }}"
     state: latest
-  with_items: "{{ cobbler_extra_packages }}"
   when: cobbler_extra_packages|length > 0
 
 # configure red hat specific things

diff --git a/roles/common/tasks/nagios.yml b/roles/common/tasks/nagios.yml
index 0528672d9a5932bfa42467ab31edd4bcdc6a0b91..34e8b553422d243e9e27987d049ed8e8e36da23b 100644 (file)
--- a/roles/common/tasks/nagios.yml
+++ b/roles/common/tasks/nagios.yml
@@ -33,19 +33,17 @@
 
 - name: Install nrpe package and dependencies (RHEL/CentOS)
   package:
-    name: "{{ item }}"
+    name: "{{ nrpe_packages|list }}"
     state: latest
     enablerepo: epel
-  with_items: "{{ nrpe_packages }}"
   when:
     - ansible_os_family == "RedHat"
     - have_epel.rc == 0
 
 - name: Install nrpe package and dependencies (Ubuntu)
   package:
-    name: "{{ item }}"
+    name: "{{ nrpe_packages|list }}"
     state: latest
-  with_items: "{{ nrpe_packages }}"
   when: ansible_pkg_mgr == "apt"
 
 - name: Upload nagios sudoers.d for raid utilities.

diff --git a/roles/common/tasks/nrpe-selinux.yml b/roles/common/tasks/nrpe-selinux.yml
index 62548d12c1866f8eed65d4a3322edb4f4bdbf7b2..5550a72d925e4e3f9ead8966921dca6b98d75a5c 100644 (file)
--- a/roles/common/tasks/nrpe-selinux.yml
+++ b/roles/common/tasks/nrpe-selinux.yml
@@ -1,9 +1,8 @@
 ---
 - name: nrpe - Install SELinux dependencies
   package:
-    name: "{{ item }}"
+    name: "{{ nrpe_selinux_packages|list }}"
     state: installed
-  with_items: "{{ nrpe_selinux_packages }}"
 
 # ignore_errors in case we don't have any repos
 - name: nrpe - Ensure SELinux policy is up to date

diff --git a/roles/gateway/tasks/packages.yml b/roles/gateway/tasks/packages.yml
index 8a457b2584eeb0f5acd6a49b0ab0c6d21472b596..9c5751bd7566f436004914fe45e23a49b1b50c55 100644 (file)
--- a/roles/gateway/tasks/packages.yml
+++ b/roles/gateway/tasks/packages.yml
@@ -4,7 +4,6 @@
 
 - name: Install and update packages
   yum:
-    name: "{{ item }}"
+    name: "{{ packages|list }}"
     state: latest
     enablerepo: epel
-  with_items: "{{ packages }}"

diff --git a/roles/paddles/tasks/apt_systems.yml b/roles/paddles/tasks/apt_systems.yml
index 19e0f0678356de92611509e1d2a486fc8eb7bed5..4f3337deefe60821ec6dba8aa8d01a958d6f6d71 100644 (file)
--- a/roles/paddles/tasks/apt_systems.yml
+++ b/roles/paddles/tasks/apt_systems.yml
@@ -6,10 +6,9 @@
 
 - name: Install packages via apt
   apt:
-    name: "{{ item }}"
+    name: "{{ paddles_extra_packages|list }}"
     state: latest
     update_cache: yes
     cache_valid_time: 600
-  with_items: "{{ paddles_extra_packages }}"
   tags:
     - packages

diff --git a/roles/paddles/tasks/zypper_systems.yml b/roles/paddles/tasks/zypper_systems.yml
index 83894805646ad10b99dd5b12aa141e9a0ad11659..a0be05930f650f3d50a490012a6d132adb07c36d 100644 (file)
--- a/roles/paddles/tasks/zypper_systems.yml
+++ b/roles/paddles/tasks/zypper_systems.yml
@@ -6,10 +6,9 @@
 
 - name: Install packages via zypper
   zypper:
-    name: "{{ item }}"
+    name: "{{ paddles_extra_packages|list }}"
     state: latest
     update_cache: yes
-  with_items: "{{ paddles_extra_packages }}"
   tags:
     - packages
 

diff --git a/roles/pulpito/tasks/apt_systems.yml b/roles/pulpito/tasks/apt_systems.yml
index 899200c3da2d30ebe51a24d82e08a5d044484750..614d76c6570bae246e21bc76c0c8d9957fe82ffe 100644 (file)
--- a/roles/pulpito/tasks/apt_systems.yml
+++ b/roles/pulpito/tasks/apt_systems.yml
@@ -1,11 +1,10 @@
 ---
 - name: Install packages via apt
   apt:
-    name: "{{ item }}"
+    name: "{{ pulpito_extra_packages|list }}"
     state: latest
     update_cache: yes
     cache_valid_time: 600
   no_log: true
-  with_items: "{{ pulpito_extra_packages }}"
   tags:
     - packages

diff --git a/roles/pulpito/tasks/yum_systems.yml b/roles/pulpito/tasks/yum_systems.yml
index 1f6624fd12f369cafc17bef0407555323063ecb2..cf2a3f41b978f14759f0cde9192fad66500f2176 100644 (file)
--- a/roles/pulpito/tasks/yum_systems.yml
+++ b/roles/pulpito/tasks/yum_systems.yml
@@ -1,9 +1,8 @@
 ---
 - name: Install packages via yum
   yum:
-    name: "{{ item }}"
+    name: "{{ pulpito_extra_packages|list }}"
     state: latest
   no_log: true
-  with_items: "{{ pulpito_extra_packages }}"
   tags:
     - packages

diff --git a/roles/pulpito/tasks/zypper_systems.yml b/roles/pulpito/tasks/zypper_systems.yml
index fe3505b5eda905c79d5645e99f34cf2c1f2cc6ad..91f3b914b91c2489e19aa1a52c8588db9af70d47 100644 (file)
--- a/roles/pulpito/tasks/zypper_systems.yml
+++ b/roles/pulpito/tasks/zypper_systems.yml
@@ -1,10 +1,9 @@
 ---
 - name: Install packages via zypper
   zypper:
-    name: "{{ item }}"
+    name: "{{ pulpito_extra_packages|list }}"
     state: latest
     update_cache: yes
   #no_log: true
-  with_items: "{{ pulpito_extra_packages }}"
   tags:
     - packages

diff --git a/roles/testnode/tasks/apt/packages.yml b/roles/testnode/tasks/apt/packages.yml
index 74c5aebe7d3e396c8dd3cecc460188679010041f..662a892007232c08904db25e612309f519c75338 100644 (file)
--- a/roles/testnode/tasks/apt/packages.yml
+++ b/roles/testnode/tasks/apt/packages.yml
@@ -1,44 +1,39 @@
 ---
 - name: Ensure packages are not present.
   apt:
-    name: "{{ item }}"
+    name: "{{ ceph_packages_to_remove|list + packages_to_remove|list }}"
     state: absent
     force: yes
-  with_items: "{{ ceph_packages_to_remove|list + packages_to_remove|list }}"
   when: ceph_packages_to_remove|length > 0 or
         packages_to_remove|length > 0
 
 - name: Upgrade packages
   apt:
-    name: "{{ item }}"
+    name: "{{ packages_to_upgrade|list }}"
     state: latest
     force: yes
-  with_items: "{{ packages_to_upgrade }}"
   when: packages_to_upgrade|length > 0
 
 - name: Upgrade non aarch64 packages
   apt:
-    name: "{{ item }}"
+    name: "{{ non_aarch64_packages_to_upgrade|list }}"
     state: latest
     force: yes
-  with_items: "{{ non_aarch64_packages_to_upgrade }}"
   when:
     non_aarch64_packages_to_upgrade|length > 0 and
     ansible_architecture != "aarch64"
 
 - name: Install packages
   apt:
-    name: "{{ item }}"
+    name: "{{ packages|list + common_packages|list }}"
     state: present 
     force: yes
-  with_items: "{{ packages|list + common_packages|list }}"
   when: packages|length > 0 or
         common_packages|length > 0
 
 - name: Install non aarch64 packages
   apt:
-    name: "{{ item }}"
+    name: "{{ non_aarch64_packages|list + non_aarch64_common_packages|list }}"
     state: present
     force: yes
-  with_items: "{{ non_aarch64_packages|list + non_aarch64_common_packages|list }}"
   when: ansible_architecture != "aarch64"

diff --git a/roles/testnode/tasks/pip.yml b/roles/testnode/tasks/pip.yml
index 16d90da946e6f329ffbf58290db2f7e948dc3077..8b4f12bb38c906e618778a895180249dec927543 100644 (file)
--- a/roles/testnode/tasks/pip.yml
+++ b/roles/testnode/tasks/pip.yml
@@ -31,5 +31,4 @@
 
 - name: Install packages via pip
   pip:
-    name: "{{ item }}"
-  with_items: "{{ pip_packages_to_install }}"
+    name: "{{ pip_packages_to_install|list }}"

diff --git a/roles/testnode/tasks/yum/packages.yml b/roles/testnode/tasks/yum/packages.yml
index c9136f3858525dbd11ba55315f6fa828bcf40f8f..c583f217dde366ae1117f8fa6064b99cd1b92547 100644 (file)
--- a/roles/testnode/tasks/yum/packages.yml
+++ b/roles/testnode/tasks/yum/packages.yml
@@ -32,46 +32,40 @@
 
 - name: Ensure ceph packages are not present.
   package:
-    name: "{{ item }}"
+    name: "{{ ceph_packages_to_remove|list }}"
     state: absent
-  with_items: "{{ ceph_packages_to_remove }}"
   tags:
     - remove-ceph
 
 - name: Ensure ceph dependency packages are not present.
   package:
-    name: "{{ item }}"
+    name: "{{ ceph_dependency_packages_to_remove|list }}"
     state: absent
-  with_items: "{{ ceph_dependency_packages_to_remove }}"
   tags:
     - remove-ceph-dependency
 
 
 - name: Install packages
   package:
-    name: "{{ item }}"
+    name: "{{ packages|list }}"
     state: present 
-  with_items: "{{ packages }}"
   when: packages|length > 0
 
 - name: Install epel packages
   package:
-    name: "{{ item }}"
+    name: "{{ epel_packages|list }}"
     state: present
     enablerepo: epel
-  with_items: "{{ epel_packages }}"
   when: epel_packages|length > 0
 
 - name: Remove packages
   package:
-    name: "{{ item }}"
+    name: "{{ packages_to_remove|list }}"
     state: absent
-  with_items: "{{ packages_to_remove }}"
   when: packages_to_remove|length > 0
 
 - name: Upgrade packages
   package:
-    name: "{{ item }}"
+    name: "{{ packages_to_upgrade|list }}"
     state: latest
-  with_items: "{{ packages_to_upgrade }}"
   when: packages_to_upgrade|length > 0

diff --git a/roles/testnode/tasks/zap_disks.yml b/roles/testnode/tasks/zap_disks.yml
index dacac0621c7bedee5676b4ca81854353cdddbe6e..0897204dd8bb8c97709b8ad7a079abc9cb536f4a 100644 (file)
--- a/roles/testnode/tasks/zap_disks.yml
+++ b/roles/testnode/tasks/zap_disks.yml
@@ -5,21 +5,14 @@
 
 - name: Make sure apt dependencies are installed
   apt:
-    name: "{{ item }}"
+    name: ['gdisk', 'dmsetup']
     state: present
-  with_items:
-    - gdisk
-    - dmsetup
   when: ansible_os_family == "Debian"
 
 - name: Make sure rpm dependencies are installed
   package:
-    name: "{{ item }}"
+    name: ['gdisk', 'device-mapper']
     state: present
-  with_items:
-    - gdisk
-    # for dmsetup
-    - device-mapper
   when: ansible_os_family == "RedHat"
 
 - name: Set root disk

diff --git a/roles/testnode/tasks/zypper/packages.yml b/roles/testnode/tasks/zypper/packages.yml
index b4fb8357a6cc0729b19738257792d83323b79640..2454ff200525ead7eadb64c6e28605d474ebb7de 100644 (file)
--- a/roles/testnode/tasks/zypper/packages.yml
+++ b/roles/testnode/tasks/zypper/packages.yml
@@ -1,37 +1,32 @@
 ---
 - name: Ensure ceph packages are not present.
   zypper:
-    name: "{{ item }}"
+    name: "{{ ceph_packages_to_remove|list }}"
     state: absent
-  with_items: "{{ ceph_packages_to_remove }}"
   tags:
     - remove-ceph
 
 - name: Ensure ceph dependency packages are not present.
   zypper:
-    name: "{{ item }}"
+    name: "{{ ceph_dependency_packages_to_remove|list }}"
     state: absent
-  with_items: "{{ ceph_dependency_packages_to_remove }}"
   tags:
     - remove-ceph-dependency
 
 - name: Remove packages
   zypper:
-    name: "{{ item }}"
+    name: "{{ packages_to_remove|list }}"
     state: absent
-  with_items: "{{ packages_to_remove }}"
   when: packages_to_remove|length > 0
 
 - name: Install packages
   zypper:
-    name: "{{ item }}"
+    name: "{{ packages|list }}"
     state: present
-  with_items: "{{ packages }}"
   when: packages|length > 0
 
 - name: Upgrade packages
   zypper:
-    name: "{{ item }}"
+    name: "{{ packages_to_upgrade|list }}"
     state: latest
-  with_items: "{{ packages_to_upgrade }}"
   when: packages_to_upgrade|length > 0

diff --git a/roles/teuthology/tasks/apt_systems.yml b/roles/teuthology/tasks/apt_systems.yml
index fb7038094af8a4f5c110aae029d3a8f262c1173e..2ce01210d07aa007e7af4522d89080dab996c398 100644 (file)
--- a/roles/teuthology/tasks/apt_systems.yml
+++ b/roles/teuthology/tasks/apt_systems.yml
@@ -6,10 +6,9 @@
 
 - name: Install packages via apt
   apt:
-    name: "{{ item }}"
+    name: "{{ teuthology_extra_packages|list }}"
     state: latest
     update_cache: yes
     cache_valid_time: 600
-  with_items: "{{ teuthology_extra_packages }}"
   tags:
     - packages

diff --git a/roles/teuthology/tasks/zypper_systems.yml b/roles/teuthology/tasks/zypper_systems.yml
index af641bae67d002e2d15b2c337508409f5f892f47..d01969c2b91acfc8f3e15f064c03b348dabd379c 100644 (file)
--- a/roles/teuthology/tasks/zypper_systems.yml
+++ b/roles/teuthology/tasks/zypper_systems.yml
@@ -6,9 +6,8 @@
 
 - name: Install packages via zypper
   zypper:
-    name: "{{ item }}"
+    name: "{{ teuthology_extra_packages|list }}"
     state: latest
     update_cache: yes
-  with_items: "{{ teuthology_extra_packages }}"
   tags:
     - packages

diff --git a/roles/vmhost/tasks/packages.yml b/roles/vmhost/tasks/packages.yml
index 0a36f86b57a54be20a54eb9093e6c453d586f23d..8d35482b020db81b48dcd971948959cd25a78128 100644 (file)
--- a/roles/vmhost/tasks/packages.yml
+++ b/roles/vmhost/tasks/packages.yml
@@ -1,10 +1,9 @@
 ---
 - name: Install packages via apt
   apt:
-    name: "{{ item }}"
+    name: "{{ vmhost_apt_packages|list }}"
     state: latest
     update_cache: yes
     cache_valid_time: 600
-  with_items: "{{ vmhost_apt_packages }}"
   tags:
     - packages