From 79d547fcf9d925574a803407947d1e9e176098ba Mon Sep 17 00:00:00 2001
From: kashapovd <y.kashapovd@gmail.com>
Date: Fri, 29 Oct 2021 05:26:00 +0000
Subject: [PATCH] switched to lists instead loops

---
 roles/install-packages/tasks/main.yml    | 57 +++++-------------------
 roles/install-zsh-and-vim/tasks/main.yml | 23 ++--------
 2 files changed, 15 insertions(+), 65 deletions(-)

diff --git a/roles/install-packages/tasks/main.yml b/roles/install-packages/tasks/main.yml
index ebc25f8..bc1991b 100755
--- a/roles/install-packages/tasks/main.yml
+++ b/roles/install-packages/tasks/main.yml
@@ -1,55 +1,22 @@
 ---
 # tasks file for install-packages
 - block: # red hat based distros
-  - yum: name={{item}} state=latest update_cache=True
-    with_items:
-    - iptables-services
-    - iperf3
-    - git
-    - zsh
-    - vim
-    - wget
-    - epel-release
-    - bmon
-    - curl
-    - tcpdump
-    - nmap
-    - mc
-    - nano
-    - iptraf-ng
+  - yum: 
+      name: ['iptables-services', 'iperf3', 'git', 'zsh', 'vim', 'wget', 'epel-release', 'bmon', 'curl', 'tcpdump', 'nmap', 'mc', 'nano', 'iptraf-ng']
+      state: latest 
+      update_cache: True
   when: ansible_os_family == "RedHat"
 
 - block: # debian based distros
-  - apt: name={{item}} state=latest update_cache=True
-    with_items:
-    - iperf3
-    - git
-    - zsh
-    - vim
-    - wget
-    - bmon
-    - curl
-    - tcpdump
-    - nmap
-    - nano
-    - mc
-    - iptraf-ng
+  - apt: 
+      name: ['iperf3', 'git', 'zsh', 'vim', 'wget', 'bmon', 'curl', 'tcpdump', 'nmap', 'nano', 'mc', 'iptraf-ng']
+      state: latest
+      update_cache: True
   when: ansible_os_family == "Debian"
 
 - block: # alpine
-  - apk: name={{item}} state=latest update_cache=True
-    with_items:
-    - git
-    - zsh
-    - zsh-vcs
-    - vim
-    - wget
-    - curl
-    - tcpdump
-    - nmap
-    - bmon
-    - shadow
-    - nano
-    - mc
-    - iptraf-ng
+  - apk: 
+      name: ['git', 'zsh', 'zsh-vcs', 'vim', 'wget', 'curl', 'tcpdump', 'nmap', 'bmon', 'shadow', 'nano', 'mc', 'iptraf-ng']
+      state: latest
+      update_cache: True
   when: ansible_os_family == "Alpine"
\ No newline at end of file
diff --git a/roles/install-zsh-and-vim/tasks/main.yml b/roles/install-zsh-and-vim/tasks/main.yml
index 9cba6c0..1ea25e2 100755
--- a/roles/install-zsh-and-vim/tasks/main.yml
+++ b/roles/install-zsh-and-vim/tasks/main.yml
@@ -1,40 +1,23 @@
 ---
 - block: #red hat based distros
   - yum: 
-      name: '{{ item }}' 
+      name: ['git', 'zsh', 'vim', 'wget']
       state: latest 
       update_cache: true
-    with_items:
-      - git
-      - zsh
-      - vim
-      - wget
   when: ansible_os_family == "RedHat" and install_deps == true and update_only == false
 
 - block: #debian based distros
   - apt: 
-      name: '{{ item }}' 
+      name: ['git', 'zsh', 'vim', 'wget']
       state: latest 
       update_cache: true
-    with_items:
-      - git
-      - zsh
-      - vim
-      - wget
   when: ansible_os_family == "Debian" and install_deps == true and update_only == false
 
 - block: #alpine
   - apk:
-      name: '{{ item }}' 
+      name: ['git', 'zsh', 'vim', 'wget', 'zsh-vcs', 'shadow']
       state: latest 
       update_cache: true
-    with_items:
-      - git
-      - zsh
-      - vim
-      - wget
-      - zsh-vcs
-      - shadow
   when: ansible_os_family == "Alpine" and install_deps == true and update_only == false
 
 - name: change default shell