From ebba76be0e4ce487a04b610d700179ab5fd48b69 Mon Sep 17 00:00:00 2001 From: Scott Wallace Date: Sun, 20 Jan 2019 10:51:09 +0000 Subject: [PATCH] Convert from 'with_items' to 'loop' --- .ansible/roles/home_server/tasks/basics.yaml | 2 +- .ansible/roles/home_server/tasks/sensu.yaml | 14 +++++++------- .ansible/roles/home_server/tasks/sensu_checks.yaml | 4 ++-- .ansible/roles/linux_desktop/tasks/config.yaml | 2 +- .ansible/roles/linux_desktop/tasks/software.yaml | 6 +++--- .ansible/roles/mac_desktop/tasks/homebrew.yaml | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.ansible/roles/home_server/tasks/basics.yaml b/.ansible/roles/home_server/tasks/basics.yaml index 301381a..7afe24d 100644 --- a/.ansible/roles/home_server/tasks/basics.yaml +++ b/.ansible/roles/home_server/tasks/basics.yaml @@ -4,5 +4,5 @@ yum: name: "{{ item }}" state: latest - with_items: "{{ server_packages }}" + loop: "{{ server_packages }}" become: true diff --git a/.ansible/roles/home_server/tasks/sensu.yaml b/.ansible/roles/home_server/tasks/sensu.yaml index df2c061..b3129c8 100644 --- a/.ansible/roles/home_server/tasks/sensu.yaml +++ b/.ansible/roles/home_server/tasks/sensu.yaml @@ -15,7 +15,7 @@ name: erlang state: present become: true - + - name: Install RabbitMQ & Redis tags: - install @@ -23,10 +23,10 @@ name: "{{ item }}" state: present become: true - with_items: + loop: - http://www.rabbitmq.com/releases/rabbitmq-server/current/rabbitmq-server-3.6.15-1.el7.noarch.rpm - redis - + - name: Install the latest version of Sensu tags: - install @@ -34,7 +34,7 @@ name: "{{ item }}" state: latest become: true - with_items: + loop: - sensu - uchiwa @@ -79,7 +79,7 @@ "bind": "0.0.0.0", "port": 4567 } - } + } dest: "{{ sensu_basepath }}/conf.d/api.json" become: true @@ -132,7 +132,7 @@ name: "{{ item }}" enabled: true state: started - with_items: + loop: - sensu-client - sensu-server - sensu-api @@ -152,5 +152,5 @@ notify: - restart firewalld become: true - + - import_tasks: sensu_checks.yaml diff --git a/.ansible/roles/home_server/tasks/sensu_checks.yaml b/.ansible/roles/home_server/tasks/sensu_checks.yaml index 972af6b..9cf7d66 100644 --- a/.ansible/roles/home_server/tasks/sensu_checks.yaml +++ b/.ansible/roles/home_server/tasks/sensu_checks.yaml @@ -3,7 +3,7 @@ - install command: "sensu-install -p {{ item }}" become: true - with_items: + loop: - cpu-checks - disk-checks - memory-checks @@ -48,4 +48,4 @@ subscribers: default interval: 60 notify: restart sensu-server - become: true \ No newline at end of file + become: true diff --git a/.ansible/roles/linux_desktop/tasks/config.yaml b/.ansible/roles/linux_desktop/tasks/config.yaml index b48f2dd..0b8b75e 100644 --- a/.ansible/roles/linux_desktop/tasks/config.yaml +++ b/.ansible/roles/linux_desktop/tasks/config.yaml @@ -4,7 +4,7 @@ git: repo: "{{ item.repo }}" dest: "{{ item.dest }}" - with_items: "{{ config_repos }}" + loop: "{{ config_repos }}" - name: Conky configuration tags: diff --git a/.ansible/roles/linux_desktop/tasks/software.yaml b/.ansible/roles/linux_desktop/tasks/software.yaml index d405572..1524e1e 100644 --- a/.ansible/roles/linux_desktop/tasks/software.yaml +++ b/.ansible/roles/linux_desktop/tasks/software.yaml @@ -4,7 +4,7 @@ apt_repository: repo: "{{ item }}" state: present - with_items: "{{ linux_repos }}" + loop: "{{ linux_repos }}" become: true - name: Installing packages @@ -13,7 +13,7 @@ package: name: "{{ item }}" state: present - with_items: "{{ linux_packages }}" + loop: "{{ linux_packages }}" become: true - name: Installing Snaps @@ -23,7 +23,7 @@ # name: "{{ item }}" # state: present command: "snap install {{ item }}" - with_items: "{{ linux_apps }}" + loop: "{{ linux_apps }}" become: true - name: Checking for Modern Pictogram font diff --git a/.ansible/roles/mac_desktop/tasks/homebrew.yaml b/.ansible/roles/mac_desktop/tasks/homebrew.yaml index 47e9529..75ee964 100644 --- a/.ansible/roles/mac_desktop/tasks/homebrew.yaml +++ b/.ansible/roles/mac_desktop/tasks/homebrew.yaml @@ -22,7 +22,7 @@ homebrew_tap: name: "{{ item }}" state: present - with_items: "{{ homebrew_tap_items }}" + loop: "{{ homebrew_tap_items }}" # Update and upgrades - name: Homebrew update and upgrades @@ -39,7 +39,7 @@ homebrew: name: "{{ item }}" state: present - with_items: "{{ homebrew_brew_items }}" + loop: "{{ homebrew_brew_items }}" # Casks - name: Install Homebrew Casks @@ -48,4 +48,4 @@ homebrew_cask: name: "{{ item }}" state: present - with_items: "{{ homebrew_cask_items }}" + loop: "{{ homebrew_cask_items }}"