From 5b2ab0d8d329bd0495c3e63bcb11efb3eeb35c76 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Fri, 24 Mar 2017 14:15:09 +0100 Subject: [PATCH] Ansible >= 2.2 supported --- admin-users/meta/main.yml | 2 +- admin-users/tasks/adduser_debian.yml | 16 ++++++++-------- amavis/meta/main.yml | 2 +- apache/meta/main.yml | 2 +- apache/tasks/main.yml | 4 ++-- apt-repositories/meta/main.yml | 2 +- bind/meta/main.yml | 2 +- clamav/meta/main.yml | 2 +- courier/meta/main.yml | 2 +- dhcp/meta/main.yml | 2 +- drbd-utils/meta/main.yml | 2 +- drbd-utils/tasks/munin.yml | 4 ++-- drbd-utils/tasks/nagios.yml | 8 ++++---- elastic-sources-list/meta/main.yml | 2 +- elastic-stack/meta/main.yml | 2 +- elasticsearch-curator/meta/main.yml | 2 +- elasticsearch/tasks/datadir.yml | 8 ++++---- elasticsearch/tasks/tmpdir.yml | 4 ++-- etc-git/meta/main.yml | 2 +- etc-git/tasks/main.yml | 4 ++-- evoacme/meta/main.yml | 2 +- evoacme/tasks/certbot.yml | 4 ++-- evoacme/tasks/webserver.yml | 8 ++++---- evolinux-base/meta/main.yml | 2 +- evolinux-base/tasks/default_www.yml | 8 ++++---- evolinux-base/tasks/fstab.yml | 4 ++-- evolinux-base/tasks/hardware.yml | 8 ++++---- evolinux-base/tasks/packages.yml | 4 ++-- evolinux-base/tasks/postfix.yml | 4 ++-- evolinux-base/tasks/root.yml | 4 ++-- evolinux-base/tasks/ssh.yml | 4 ++-- evomaintenance/tasks/main.yml | 4 ++-- evomaintenance/tasks/trap.yml | 8 ++++---- fail2ban/meta/main.yml | 2 +- filebeat/tasks/main.yml | 12 ++++++------ haproxy/meta/main.yml | 2 +- kibana-proxy-nginx/meta/main.yml | 2 +- kvm-host/meta/main.yml | 2 +- kvm-host/tasks/main.yml | 4 ++-- ldap/meta/main.yml | 2 +- listupgrade/meta/main.yml | 2 +- memcached/meta/main.yml | 2 +- minifirewall/meta/main.yml | 2 +- minifirewall/tasks/config.yml | 4 ++-- minifirewall/tasks/install.yml | 8 ++++---- monit/meta/main.yml | 2 +- munin/meta/main.yml | 2 +- mysql/meta/main.yml | 2 +- mysql/tasks/datadir.yml | 8 ++++---- mysql/tasks/log2mail.yml | 4 ++-- mysql/tasks/munin.yml | 4 ++-- mysql/tasks/nrpe.yml | 4 ++-- nagios-nrpe/meta/main.yml | 2 +- nginx/meta/main.yml | 2 +- nginx/tasks/main.yml | 4 ++-- nodejs/meta/main.yml | 2 +- php-fpm/meta/main.yml | 2 +- postfix/meta/main.yml | 2 +- postfix/tasks/main.yml | 4 ++-- postgresql/meta/main.yml | 2 +- proftpd/meta/main.yml | 2 +- rabbitmq/meta/main.yml | 2 +- rbenv/meta/main.yml | 2 +- rbenv/tasks/main.yml | 4 ++-- redis/meta/main.yml | 2 +- samba/meta/main.yml | 2 +- spamassassin/meta/main.yml | 2 +- squid/meta/main.yml | 2 +- squid/tasks/log2mail.yml | 4 ++-- squid/tasks/minifirewall.yml | 4 ++-- tomcat-instance/meta/main.yml | 2 +- tomcat-instance/tasks/check.yml | 4 ++-- tomcat-instance/tasks/nagios.yml | 4 ++-- varnish/meta/main.yml | 2 +- webapps/meta/main.yml | 2 +- 75 files changed, 134 insertions(+), 134 deletions(-) diff --git a/admin-users/meta/main.yml b/admin-users/meta/main.yml index 9432741f..7779f782 100644 --- a/admin-users/meta/main.yml +++ b/admin-users/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/admin-users/tasks/adduser_debian.yml b/admin-users/tasks/adduser_debian.yml index 6110b707..f486d364 100644 --- a/admin-users/tasks/adduser_debian.yml +++ b/admin-users/tasks/adduser_debian.yml @@ -5,8 +5,8 @@ register: uidisbusy failed_when: False changed_when: False - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + - name: Add Unix account with classical uid for '{{ user.name }}' user: @@ -39,8 +39,8 @@ stat: path: "/usr/share/scripts/evomaintenance.sh" register: evomaintenance_script - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + - name: Add evomaintenance trap for '{{ user.name }}' lineinfile: @@ -69,8 +69,8 @@ changed_when: False failed_when: False register: grep_allowusers_ssh - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + - name: Add AllowUsers sshd directive for '{{ user.name }}' lineinfile: @@ -95,8 +95,8 @@ changed_when: False failed_when: False register: grep_matchuser_ssh - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + - name: Add Match User sshd directive for '{{ user.name }}' lineinfile: diff --git a/amavis/meta/main.yml b/amavis/meta/main.yml index ab0e53d3..affdf9c9 100644 --- a/amavis/meta/main.yml +++ b/amavis/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/apache/meta/main.yml b/apache/meta/main.yml index 01139109..0949e1dd 100644 --- a/apache/meta/main.yml +++ b/apache/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/apache/tasks/main.yml b/apache/tasks/main.yml index c355b6a2..5b781949 100644 --- a/apache/tasks/main.yml +++ b/apache/tasks/main.yml @@ -123,8 +123,8 @@ failed_when: False changed_when: False register: envvar_grep_umask - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + tags: - apache diff --git a/apt-repositories/meta/main.yml b/apt-repositories/meta/main.yml index cc563fab..f7a7a707 100644 --- a/apt-repositories/meta/main.yml +++ b/apt-repositories/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/bind/meta/main.yml b/bind/meta/main.yml index a23788b0..f295919e 100644 --- a/bind/meta/main.yml +++ b/bind/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/clamav/meta/main.yml b/clamav/meta/main.yml index 5a60cb27..732965a4 100644 --- a/clamav/meta/main.yml +++ b/clamav/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/courier/meta/main.yml b/courier/meta/main.yml index 03c49807..b7605b2d 100644 --- a/courier/meta/main.yml +++ b/courier/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/dhcp/meta/main.yml b/dhcp/meta/main.yml index 59f4b98b..2fd68915 100644 --- a/dhcp/meta/main.yml +++ b/dhcp/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/drbd-utils/meta/main.yml b/drbd-utils/meta/main.yml index 6fa78a43..3f9cb96e 100644 --- a/drbd-utils/meta/main.yml +++ b/drbd-utils/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/drbd-utils/tasks/munin.yml b/drbd-utils/tasks/munin.yml index 09572ceb..72d943d2 100644 --- a/drbd-utils/tasks/munin.yml +++ b/drbd-utils/tasks/munin.yml @@ -4,8 +4,8 @@ stat: path: /etc/munin/plugins/ register: munin_plugins_dir - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + # https://raw.githubusercontent.com/munin-monitoring/contrib/master/plugins/drbd/drbd - name: Get Munin plugin diff --git a/drbd-utils/tasks/nagios.yml b/drbd-utils/tasks/nagios.yml index 0aa8f54d..c28e44d6 100644 --- a/drbd-utils/tasks/nagios.yml +++ b/drbd-utils/tasks/nagios.yml @@ -4,8 +4,8 @@ stat: path: /usr/local/lib/nagios/plugins/ register: nagios_plugins_dir - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + - name: Check if /usr is a partition shell: "mount | grep 'on /usr type'" @@ -14,8 +14,8 @@ changed_when: False failed_when: False register: usr_partition - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + - name: Mount /usr in rw command: mount -o remount,rw /usr diff --git a/elastic-sources-list/meta/main.yml b/elastic-sources-list/meta/main.yml index 1156b677..20c0e73e 100644 --- a/elastic-sources-list/meta/main.yml +++ b/elastic-sources-list/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/elastic-stack/meta/main.yml b/elastic-stack/meta/main.yml index 8a1a204e..c6852fa8 100644 --- a/elastic-stack/meta/main.yml +++ b/elastic-stack/meta/main.yml @@ -7,7 +7,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/elasticsearch-curator/meta/main.yml b/elasticsearch-curator/meta/main.yml index 2fb54a4c..585a9a88 100644 --- a/elasticsearch-curator/meta/main.yml +++ b/elasticsearch-curator/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/elasticsearch/tasks/datadir.yml b/elasticsearch/tasks/datadir.yml index e60ea4c3..a0b87ad5 100644 --- a/elasticsearch/tasks/datadir.yml +++ b/elasticsearch/tasks/datadir.yml @@ -5,15 +5,15 @@ stat: path: "{{ elasticsearch_custom_datadir }}" register: elasticsearch_custom_datadir_test - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + - name: "read the real datadir" command: readlink -f /var/lib/elasticsearch changed_when: false register: elasticsearch_current_real_datadir_test - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + tags: - elasticsearch when: elasticsearch_custom_datadir diff --git a/elasticsearch/tasks/tmpdir.yml b/elasticsearch/tasks/tmpdir.yml index dee93e69..2819570c 100644 --- a/elasticsearch/tasks/tmpdir.yml +++ b/elasticsearch/tasks/tmpdir.yml @@ -5,8 +5,8 @@ register: fstab_tmp_noexec failed_when: False changed_when: False - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + - block: - name: "Create {{ elasticsearch_custom_tmpdir or elasticsearch_default_tmpdir | mandatory }}" diff --git a/etc-git/meta/main.yml b/etc-git/meta/main.yml index 611feef2..7fade98b 100644 --- a/etc-git/meta/main.yml +++ b/etc-git/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/etc-git/tasks/main.yml b/etc-git/tasks/main.yml index 3770dbf9..92e98905 100644 --- a/etc-git/tasks/main.yml +++ b/etc-git/tasks/main.yml @@ -47,8 +47,8 @@ changed_when: False failed_when: False register: git_log - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + - name: initial commit is present? shell: "git add -A . && git commit -m \"Initial commit via Ansible\"" diff --git a/evoacme/meta/main.yml b/evoacme/meta/main.yml index 8870bb92..2b9f6c70 100644 --- a/evoacme/meta/main.yml +++ b/evoacme/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/evoacme/tasks/certbot.yml b/evoacme/tasks/certbot.yml index 25bd5d0b..6b978604 100644 --- a/evoacme/tasks/certbot.yml +++ b/evoacme/tasks/certbot.yml @@ -27,8 +27,8 @@ warn: no changed_when: False failed_when: False - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: usr_partition - name: Mount /usr in rw diff --git a/evoacme/tasks/webserver.yml b/evoacme/tasks/webserver.yml index cc97617a..1395b365 100644 --- a/evoacme/tasks/webserver.yml +++ b/evoacme/tasks/webserver.yml @@ -2,13 +2,13 @@ - name: Determine Nginx presence stat: path: /etc/nginx/nginx.conf - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: stn - name: Determine Apache presence stat: path: /etc/apache2/apache2.conf - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: sta diff --git a/evolinux-base/meta/main.yml b/evolinux-base/meta/main.yml index b1107923..2d640995 100644 --- a/evolinux-base/meta/main.yml +++ b/evolinux-base/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/evolinux-base/tasks/default_www.yml b/evolinux-base/tasks/default_www.yml index c54c8830..40f0d603 100644 --- a/evolinux-base/tasks/default_www.yml +++ b/evolinux-base/tasks/default_www.yml @@ -53,8 +53,8 @@ - name: is Nginx installed? stat: path: /etc/nginx/sites-available - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: nginx_sites_available - block: @@ -86,8 +86,8 @@ - name: is Apache installed? stat: path: /etc/apache2/sites-available - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: apache_sites_available - block: diff --git a/evolinux-base/tasks/fstab.yml b/evolinux-base/tasks/fstab.yml index 628d3e7d..dc267c88 100644 --- a/evolinux-base/tasks/fstab.yml +++ b/evolinux-base/tasks/fstab.yml @@ -4,8 +4,8 @@ - name: Fetch fstab content command: "grep -v '^#' /etc/fstab" - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: fstab_content failed_when: False changed_when: False diff --git a/evolinux-base/tasks/hardware.yml b/evolinux-base/tasks/hardware.yml index 8c85b206..e146b885 100644 --- a/evolinux-base/tasks/hardware.yml +++ b/evolinux-base/tasks/hardware.yml @@ -8,8 +8,8 @@ - name: Check if Broadcom NetXtreme II device is present shell: "lspci | grep -q 'NetXtreme II'" - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: broadcom failed_when: False changed_when: False @@ -27,8 +27,8 @@ - name: Detect if RAID is installed shell: lspci | grep "RAID bus controller" | grep -v Intel - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: raidmodel changed_when: "'FAILED' in raidmodel.stdout" failed_when: "'FAILED' in raidmodel.stdout" diff --git a/evolinux-base/tasks/packages.yml b/evolinux-base/tasks/packages.yml index f3bab110..bd1ef0e9 100644 --- a/evolinux-base/tasks/packages.yml +++ b/evolinux-base/tasks/packages.yml @@ -62,8 +62,8 @@ - name: is an MTA installed? command: "dpkg -S /usr/sbin/sendmail" - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: mta_installed failed_when: False changed_when: False diff --git a/evolinux-base/tasks/postfix.yml b/evolinux-base/tasks/postfix.yml index 1ca58c41..e32b25dd 100644 --- a/evolinux-base/tasks/postfix.yml +++ b/evolinux-base/tasks/postfix.yml @@ -14,8 +14,8 @@ - name: fetch users list shell: getent passwd | cut -d":" -f 1 | grep -v root - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: non_root_users_list changed_when: False tags: diff --git a/evolinux-base/tasks/root.yml b/evolinux-base/tasks/root.yml index 7c47e553..9b321326 100644 --- a/evolinux-base/tasks/root.yml +++ b/evolinux-base/tasks/root.yml @@ -44,8 +44,8 @@ - name: Is .bash_history append-only shell: lsattr /root/.bash_history | grep -E "^.*a.* " - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: bash_history_append_only failed_when: False changed_when: False diff --git a/evolinux-base/tasks/ssh.yml b/evolinux-base/tasks/ssh.yml index c11187c4..d83e95d8 100644 --- a/evolinux-base/tasks/ssh.yml +++ b/evolinux-base/tasks/ssh.yml @@ -3,8 +3,8 @@ command: "grep 'Match Address' /etc/ssh/sshd_config" changed_when: False failed_when: False - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: grep_matchaddress_ssh - name: Add Match Address sshd directive diff --git a/evomaintenance/tasks/main.yml b/evomaintenance/tasks/main.yml index 0dfdb8c8..41a7268e 100644 --- a/evomaintenance/tasks/main.yml +++ b/evomaintenance/tasks/main.yml @@ -13,8 +13,8 @@ - name: list users with a shell shell: "cat /etc/passwd | grep -vE \"^root:\" | grep -E \":/[^:]+sh$\" | cut -d: -f6" changed_when: False - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: home_of_shell_users - include: trap.yml home={{ item }} diff --git a/evomaintenance/tasks/trap.yml b/evomaintenance/tasks/trap.yml index 8f734ac8..44d0a49d 100644 --- a/evomaintenance/tasks/trap.yml +++ b/evomaintenance/tasks/trap.yml @@ -1,8 +1,8 @@ - name: is {{ home }}/.bash_profile present? stat: path: "{{ home }}/.bash_profile" - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: bash_profile - name: install shell trap in {{ home }}/.bash_profile @@ -16,8 +16,8 @@ - name: is {{ home }}/.profile present? stat: path: "{{ home }}/.profile" - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: profile when: not bash_profile.stat.exists diff --git a/fail2ban/meta/main.yml b/fail2ban/meta/main.yml index 38b941e2..87587a65 100644 --- a/fail2ban/meta/main.yml +++ b/fail2ban/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/filebeat/tasks/main.yml b/filebeat/tasks/main.yml index 57014fc8..f88b3d62 100644 --- a/filebeat/tasks/main.yml +++ b/filebeat/tasks/main.yml @@ -20,14 +20,14 @@ - name: is logstash-plugin available? stat: path: /usr/share/logstash/bin/logstash-plugin - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: logstash_plugin - name: is logstash-input-beats installed? shell: grep logstash-input-beats /usr/share/logstash/Gemfile - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: logstash_plugin_installed failed_when: false changed_when: false @@ -40,8 +40,8 @@ warn: no changed_when: False failed_when: False - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: usr_partition - name: Mount /usr in rw diff --git a/haproxy/meta/main.yml b/haproxy/meta/main.yml index 5a2b925c..e443f4e5 100644 --- a/haproxy/meta/main.yml +++ b/haproxy/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/kibana-proxy-nginx/meta/main.yml b/kibana-proxy-nginx/meta/main.yml index 60863e7c..ffa851f0 100644 --- a/kibana-proxy-nginx/meta/main.yml +++ b/kibana-proxy-nginx/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/kvm-host/meta/main.yml b/kvm-host/meta/main.yml index 7181d9e2..5ad103ad 100644 --- a/kvm-host/meta/main.yml +++ b/kvm-host/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/kvm-host/tasks/main.yml b/kvm-host/tasks/main.yml index 37613d61..9e42c511 100644 --- a/kvm-host/tasks/main.yml +++ b/kvm-host/tasks/main.yml @@ -7,8 +7,8 @@ warn: no changed_when: False failed_when: False - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: usr_partition - name: Mount /usr in rw diff --git a/ldap/meta/main.yml b/ldap/meta/main.yml index f627de3e..d96a2e56 100644 --- a/ldap/meta/main.yml +++ b/ldap/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/listupgrade/meta/main.yml b/listupgrade/meta/main.yml index 4e345f08..9ecad4f6 100644 --- a/listupgrade/meta/main.yml +++ b/listupgrade/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/memcached/meta/main.yml b/memcached/meta/main.yml index f700b4ef..9d85a45e 100644 --- a/memcached/meta/main.yml +++ b/memcached/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/minifirewall/meta/main.yml b/minifirewall/meta/main.yml index be6b3c51..d965ef24 100644 --- a/minifirewall/meta/main.yml +++ b/minifirewall/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/minifirewall/tasks/config.yml b/minifirewall/tasks/config.yml index 7a3d5ad8..061825bb 100644 --- a/minifirewall/tasks/config.yml +++ b/minifirewall/tasks/config.yml @@ -4,8 +4,8 @@ shell: /sbin/iptables -L -n | grep -E "^(DROP\s+udp|ACCEPT\s+icmp)\s+--\s+0\.0\.0\.0\/0\s+0\.0\.0\.0\/0\s*$" changed_when: False failed_when: False - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: minifirewall_is_running - debug: diff --git a/minifirewall/tasks/install.yml b/minifirewall/tasks/install.yml index 76284100..f2257552 100644 --- a/minifirewall/tasks/install.yml +++ b/minifirewall/tasks/install.yml @@ -12,8 +12,8 @@ - name: is init script present? stat: path: /etc/init.d/minifirewall - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: init_minifirewall - name: init script is copied @@ -24,8 +24,8 @@ - name: is configuration present? stat: path: /etc/default/minifirewall - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: default_minifirewall - name: configuration is copied diff --git a/monit/meta/main.yml b/monit/meta/main.yml index db746437..6392e883 100644 --- a/monit/meta/main.yml +++ b/monit/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/munin/meta/main.yml b/munin/meta/main.yml index cf751f7c..2717b3cc 100644 --- a/munin/meta/main.yml +++ b/munin/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/mysql/meta/main.yml b/mysql/meta/main.yml index 2a8a083c..a8204bf9 100644 --- a/mysql/meta/main.yml +++ b/mysql/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/mysql/tasks/datadir.yml b/mysql/tasks/datadir.yml index 94f55875..ebad60e8 100644 --- a/mysql/tasks/datadir.yml +++ b/mysql/tasks/datadir.yml @@ -4,15 +4,15 @@ - name: "Is {{ mysql_custom_datadir }} present ?" stat: path: "{{ mysql_custom_datadir }}" - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: mysql_custom_datadir_test - name: "read the real datadir" command: readlink -f /var/lib/mysql changed_when: False - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: mysql_current_real_datadir_test tags: - mysql diff --git a/mysql/tasks/log2mail.yml b/mysql/tasks/log2mail.yml index 17d8dd18..c2d75b41 100644 --- a/mysql/tasks/log2mail.yml +++ b/mysql/tasks/log2mail.yml @@ -3,8 +3,8 @@ - name: Is log2mail present ? stat: path: /etc/log2mail/config - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: log2mail_config_dir tags: - mysql diff --git a/mysql/tasks/munin.yml b/mysql/tasks/munin.yml index 925bd707..8cd537e6 100644 --- a/mysql/tasks/munin.yml +++ b/mysql/tasks/munin.yml @@ -3,8 +3,8 @@ - name: is Munin present ? stat: path: /etc/munin/plugin-conf.d/munin-node - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: munin_node_plugins_config tags: - mysql diff --git a/mysql/tasks/nrpe.yml b/mysql/tasks/nrpe.yml index 6dc444a2..24e5672d 100644 --- a/mysql/tasks/nrpe.yml +++ b/mysql/tasks/nrpe.yml @@ -3,8 +3,8 @@ - name: is NRPE present ? stat: path: /etc/nagios/nrpe.d/evolix.cfg - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: nrpe_evolix_config tags: - mysql diff --git a/nagios-nrpe/meta/main.yml b/nagios-nrpe/meta/main.yml index a2aebccc..56c1ea31 100644 --- a/nagios-nrpe/meta/main.yml +++ b/nagios-nrpe/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/nginx/meta/main.yml b/nginx/meta/main.yml index e6faa659..fc0efc9b 100644 --- a/nginx/meta/main.yml +++ b/nginx/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/nginx/tasks/main.yml b/nginx/tasks/main.yml index 8b510e70..a46fb3d9 100644 --- a/nginx/tasks/main.yml +++ b/nginx/tasks/main.yml @@ -120,8 +120,8 @@ - name: Check if Munin is installed stat: path: /etc/munin/plugin-conf.d/munin-node - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: stat_munin_node tags: - nginx diff --git a/nodejs/meta/main.yml b/nodejs/meta/main.yml index 81b18efd..066f81dd 100644 --- a/nodejs/meta/main.yml +++ b/nodejs/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/php-fpm/meta/main.yml b/php-fpm/meta/main.yml index cc6a2d9f..6e8e624e 100644 --- a/php-fpm/meta/main.yml +++ b/php-fpm/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/postfix/meta/main.yml b/postfix/meta/main.yml index 866981d5..a4cc6bd0 100644 --- a/postfix/meta/main.yml +++ b/postfix/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/postfix/tasks/main.yml b/postfix/tasks/main.yml index 684e567a..aac68045 100644 --- a/postfix/tasks/main.yml +++ b/postfix/tasks/main.yml @@ -9,8 +9,8 @@ - name: check if main.cf is default shell: egrep -v "^(myhostname|mydestination|mailbox_command)" /etc/postfix/main.cf | md5sum - changed_when: False - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: default_main_cf - name: create minimal main.cf diff --git a/postgresql/meta/main.yml b/postgresql/meta/main.yml index f397b42a..a9375725 100644 --- a/postgresql/meta/main.yml +++ b/postgresql/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/proftpd/meta/main.yml b/proftpd/meta/main.yml index 2da1a53a..7b590850 100644 --- a/proftpd/meta/main.yml +++ b/proftpd/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/rabbitmq/meta/main.yml b/rabbitmq/meta/main.yml index e5b82fbb..c60e933d 100644 --- a/rabbitmq/meta/main.yml +++ b/rabbitmq/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/rbenv/meta/main.yml b/rbenv/meta/main.yml index 7eb0f7fe..790cc08f 100644 --- a/rbenv/meta/main.yml +++ b/rbenv/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/rbenv/tasks/main.yml b/rbenv/tasks/main.yml index d8ffb305..57b2fe20 100644 --- a/rbenv/tasks/main.yml +++ b/rbenv/tasks/main.yml @@ -80,7 +80,7 @@ become_user: "{{ username }}" failed_when: False changed_when: False - always_run: yes + register: ruby_installed tags: - rbenv @@ -95,7 +95,7 @@ - name: is Ruby {{ rbenv_ruby_version }} selected for {{ username }} ? shell: /bin/bash -lc "rbenv version | cut -d ' ' -f 1 | grep -Fx '{{ rbenv_ruby_version }}'" become_user: "{{ username }}" - always_run: yes + register: ruby_selected changed_when: False tags: diff --git a/redis/meta/main.yml b/redis/meta/main.yml index 73952a15..dda81c39 100644 --- a/redis/meta/main.yml +++ b/redis/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/samba/meta/main.yml b/samba/meta/main.yml index b90fd830..caf4c3c0 100644 --- a/samba/meta/main.yml +++ b/samba/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/spamassassin/meta/main.yml b/spamassassin/meta/main.yml index 0dbe1115..53c77c38 100644 --- a/spamassassin/meta/main.yml +++ b/spamassassin/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/squid/meta/main.yml b/squid/meta/main.yml index 3228d3f5..873aa74a 100644 --- a/squid/meta/main.yml +++ b/squid/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/squid/tasks/log2mail.yml b/squid/tasks/log2mail.yml index 3ac971e5..7924caa1 100644 --- a/squid/tasks/log2mail.yml +++ b/squid/tasks/log2mail.yml @@ -3,8 +3,8 @@ - name: is log2mail installed? stat: path: /etc/log2mail/config/ - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: log2mail_config - block: diff --git a/squid/tasks/minifirewall.yml b/squid/tasks/minifirewall.yml index 8ef86333..313b916b 100644 --- a/squid/tasks/minifirewall.yml +++ b/squid/tasks/minifirewall.yml @@ -2,8 +2,8 @@ - name: Check if Minifirewall is present stat: path: /etc/default/minifirewall - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: minifirewall_test - block: diff --git a/tomcat-instance/meta/main.yml b/tomcat-instance/meta/main.yml index fcd64567..abc2a536 100644 --- a/tomcat-instance/meta/main.yml +++ b/tomcat-instance/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/tomcat-instance/tasks/check.yml b/tomcat-instance/tasks/check.yml index 33277f0d..e10f0d24 100644 --- a/tomcat-instance/tasks/check.yml +++ b/tomcat-instance/tasks/check.yml @@ -7,7 +7,7 @@ shell: id -ng "{{ tomcat_instance_port }}" register: check_port_gid changed_when: false - always_run: yes + failed_when: - check_port_gid|success - check_port_gid.stdout != "{{ tomcat_instance_name }}" @@ -15,7 +15,7 @@ - name: Check use of uid shell: id -nu "{{ tomcat_instance_port }}" register: check_port_uid - always_run: yes + changed_when: false failed_when: - check_port_uid|success diff --git a/tomcat-instance/tasks/nagios.yml b/tomcat-instance/tasks/nagios.yml index bec6f085..c0249de3 100644 --- a/tomcat-instance/tasks/nagios.yml +++ b/tomcat-instance/tasks/nagios.yml @@ -10,8 +10,8 @@ warn: no changed_when: False failed_when: False - #check_mode: no (for migration to Ansible 2.2) - always_run: yes + check_mode: no + register: usr_partition - name: Mount /usr in rw diff --git a/varnish/meta/main.yml b/varnish/meta/main.yml index 408dffd5..28d227e1 100644 --- a/varnish/meta/main.yml +++ b/varnish/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian diff --git a/webapps/meta/main.yml b/webapps/meta/main.yml index 2a8a083c..a8204bf9 100644 --- a/webapps/meta/main.yml +++ b/webapps/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Debian