From 404d0c56afcbe9e0138859c77fe39fa8cf297e60 Mon Sep 17 00:00:00 2001
From: Kris Lamoureux <krislamo@uga.edu>
Date: Fri, 22 May 2020 12:28:31 -0400
Subject: [PATCH] Replace deprecated squash_actions syntax

---
 roles/easyredmine/tasks/database.yml |  6 +-----
 roles/easyredmine/tasks/redmine.yml  | 17 +++--------------
 roles/easyredmine/tasks/system.yml   | 27 +++++----------------------
 3 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/roles/easyredmine/tasks/database.yml b/roles/easyredmine/tasks/database.yml
index 82ce2bd..9b593bb 100644
--- a/roles/easyredmine/tasks/database.yml
+++ b/roles/easyredmine/tasks/database.yml
@@ -1,11 +1,7 @@
 - name: install mysql, mariadb packages
   yum:
-    name: '{{ item }}'
+    name: ['mysql-devel', 'mariadb-server', 'MySQL-python']
   become: yes
-  with_items:
-    - mysql-devel
-    - mariadb-server
-    - MySQL-python
 
 - name: manage MySql/MariaDB database service
   service:
diff --git a/roles/easyredmine/tasks/redmine.yml b/roles/easyredmine/tasks/redmine.yml
index 60549f8..3acf12f 100644
--- a/roles/easyredmine/tasks/redmine.yml
+++ b/roles/easyredmine/tasks/redmine.yml
@@ -1,20 +1,9 @@
 - name: install redmine package depdendencies
   yum:
-    name: '{{ item }}'
+    name: ['mysql-devel', 'unzip', 'rubygems', 'ruby-devel', 'libuuid-devel',
+           'zlib-devel', 'openssl-devel', 'gcc-c++', 'ImageMagick-devel',
+           'expect', 'subversion', 'git']
   become: yes
-  with_items:
-    - mysql-devel
-    - unzip
-    - rubygems
-    - ruby-devel
-    - libuuid-devel
-    - zlib-devel
-    - openssl-devel
-    - gcc-c++
-    - ImageMagick-devel
-    - expect # for install_wrapper
-    - subversion # Repository integration
-    - git # Repository integration
 
 # these gems are not user_install but the RVM path is for local redmine
 # user so installations are localized to rvm1_install_path (e.g. ~/.rvm)
diff --git a/roles/easyredmine/tasks/system.yml b/roles/easyredmine/tasks/system.yml
index 1d85d82..a254a31 100644
--- a/roles/easyredmine/tasks/system.yml
+++ b/roles/easyredmine/tasks/system.yml
@@ -3,29 +3,12 @@
 
 - name: install system tools
   yum:
-    name: '{{ item }}'
+    name: ['rsync', 'strace', 'nmap', 'yum-utils', 'sendmail',
+           'nfs-utils', 'vim-enhanced', 'tmpwatch', 'ntpdate',
+           'at', 'cronie-noanacron', 'ruby', 'mailx', 'crontabs',
+           'logrotate', 'which', 'net-tools', 'lsof', 'screen',
+           'mlocate']
   become: yes
-  with_items:
-    - rsync
-    - strace
-    - nmap
-    - yum-utils
-    - sendmail
-    - at
-    - nfs-utils
-    - vim-enhanced
-    - tmpwatch
-    - ntpdate
-    - cronie-noanacron
-    - ruby
-    - mailx
-    - crontabs
-    - logrotate
-    - which
-    - net-tools
-    - lsof
-    - screen
-    - mlocate
 
 - name: manage sendmail service
   service: