From 44650c688ef2f7876c06924c3030ead8123a0016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Tue, 2 Apr 2019 10:27:12 +0200
Subject: [PATCH] copr: squash_actions is deprecated

---
 roles/copr/backend/tasks/letsencrypt.yml |  6 +++---
 roles/copr/backend/tasks/main.yml        | 21 +++++++++++----------
 roles/copr/base/tasks/main.yml           | 22 +++++++++++++---------
 roles/copr/frontend-cloud/tasks/main.yml | 24 +++++++++++++-----------
 roles/copr/keygen/tasks/main.yml         |  4 +---
 5 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/roles/copr/backend/tasks/letsencrypt.yml b/roles/copr/backend/tasks/letsencrypt.yml
index 5e5d472dec..f9919a92e3 100644
--- a/roles/copr/backend/tasks/letsencrypt.yml
+++ b/roles/copr/backend/tasks/letsencrypt.yml
@@ -3,9 +3,9 @@
 # Particularly it follows "(Option B) The Hard Way"
 
 - name: Install required packages
-  dnf: state=latest name={{ item }}
-  with_items:
-    - certbot
+  dnf:
+    state: latest
+    name: certbot
 
 - name: Create The Web Root
   file:
diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml
index a4e0910e97..c484139087 100644
--- a/roles/copr/backend/tasks/main.yml
+++ b/roles/copr/backend/tasks/main.yml
@@ -10,18 +10,19 @@
 - user: name=copr group=copr uid=989
 
 - name: install copr-backend and copr-selinux
-  dnf: state=latest name={{ item }}
-  with_items:
-  - copr-backend
+  dnf:
+    state: latest
+    name: copr-backend
 
 - name: add additional packages for copr-backend
-  dnf: state=present name={{ item }}
-  with_items:
-  - python2-glanceclient
-  - python2-neutronclient
-  - python2-keystoneclient
-  - php-cli
-  - cronolog
+  dnf:
+    state: present
+    name:
+      - python2-glanceclient
+      - python2-neutronclient
+      - python2-keystoneclient
+      - php-cli
+      - cronolog
 
 # disable this in favor of excluding it in /etc/dnf/dnf.conf. 
 # https://github.com/ansible/ansible/issues/33187
diff --git a/roles/copr/base/tasks/main.yml b/roles/copr/base/tasks/main.yml
index ce1c618dcb..86e2fee611 100644
--- a/roles/copr/base/tasks/main.yml
+++ b/roles/copr/base/tasks/main.yml
@@ -31,21 +31,25 @@
 
 - name: install copr-selinux
   dnf: state=latest pkg=copr-selinux
+  tags:
+  - packages
 
 - name: install common copr packages
-  dnf: state=present pkg={{ item }}
-  with_items:
-  - "system-config-firewall-base"
-  - "nrpe"
+  dnf:
+    state: present
+    pkg:
+      - "system-config-firewall-base"
+      - "nrpe"
   tags:
   - packages
 
 - name: install dev helper packages
-  dnf: state=present pkg={{ item }}
-  with_items:
-  - "bash-completion"
-  - "screen"
-  - "tmux"
+  dnf:
+    state: present
+    pkg:
+      - "bash-completion"
+      - "screen"
+      - "tmux"
   tags:
   - packages
 
diff --git a/roles/copr/frontend-cloud/tasks/main.yml b/roles/copr/frontend-cloud/tasks/main.yml
index a9f6b82e8c..cb5652ce85 100644
--- a/roles/copr/frontend-cloud/tasks/main.yml
+++ b/roles/copr/frontend-cloud/tasks/main.yml
@@ -15,22 +15,24 @@
   copy: src=cron.hourly/copr-frontend dest=/etc/cron.hourly/
 
 - name: install copr-frontend and copr-selinux
-  dnf: state=latest name={{ item }}
-  with_items:
-  - copr-frontend
-  - copr-selinux
+  dnf:
+    state: latest
+    name:
+      - copr-frontend
+      - copr-selinux
   tags:
   - packages
 
   # we install python-alembic because https://bugzilla.redhat.com/show_bug.cgi?id=1536058
 - name: install additional pkgs for copr-frontend
-  dnf: state=present pkg={{ item }}
-  with_items:
-  - "bash-completion"
-  - "mod_ssl"
-  - redis
-  - pxz
-  - python3-alembic
+  dnf:
+    state: present
+    pkg:
+      - "bash-completion"
+      - "mod_ssl"
+      - redis
+      - pxz
+      - python3-alembic
   tags:
   - packages
 
diff --git a/roles/copr/keygen/tasks/main.yml b/roles/copr/keygen/tasks/main.yml
index 5a21a3ea4c..f734a00621 100644
--- a/roles/copr/keygen/tasks/main.yml
+++ b/roles/copr/keygen/tasks/main.yml
@@ -11,9 +11,7 @@
 #when: devel
 
 - name: install copr-keygen
-  dnf: state=latest name={{ item }}
-  with_items:
-  - copr-keygen
+  dnf: state=latest name=copr-keygen
   notify:
   - restart haveged