diff --git a/admin-users/tasks/main.yml b/admin-users/tasks/main.yml index e9f5dcdc..e4ee2afa 100644 --- a/admin-users/tasks/main.yml +++ b/admin-users/tasks/main.yml @@ -4,7 +4,8 @@ msg: "Error: empty variable 'admin_users'!" when: admin_users == {} -- include: adduser_debian.yml user={{ item.value }} +- include: adduser_debian.yml + user: "{{ item.value }}" with_dict: "{{ admin_users }}" when: ansible_distribution == "Debian" diff --git a/apache/tasks/main.yml b/apache/tasks/main.yml index 5b781949..4df77dcf 100644 --- a/apache/tasks/main.yml +++ b/apache/tasks/main.yml @@ -124,7 +124,6 @@ changed_when: False register: envvar_grep_umask check_mode: no - tags: - apache diff --git a/elasticsearch/tasks/tmpdir.yml b/elasticsearch/tasks/tmpdir.yml index 2819570c..380fb190 100644 --- a/elasticsearch/tasks/tmpdir.yml +++ b/elasticsearch/tasks/tmpdir.yml @@ -6,7 +6,6 @@ failed_when: False changed_when: False check_mode: no - - block: - name: "Create {{ elasticsearch_custom_tmpdir or elasticsearch_default_tmpdir | mandatory }}" @@ -29,4 +28,4 @@ - restart elasticsearch tags: - elasticsearch - when: elasticsearch_custom_tmpdir or fstab_tmp_noexec|success + when: elasticsearch_custom_tmpdir or fstab_tmp_noexec | success diff --git a/evoacme/handlers/main.yml b/evoacme/handlers/main.yml index c619715c..35c20e25 100644 --- a/evoacme/handlers/main.yml +++ b/evoacme/handlers/main.yml @@ -7,8 +7,8 @@ - name: reload apache2 service: - name: apache2 - state: reloaded + name: apache2 + state: reloaded - name: apt update apt: diff --git a/evolinux-base/tasks/default_www.yml b/evolinux-base/tasks/default_www.yml index 40f0d603..750d2200 100644 --- a/evolinux-base/tasks/default_www.yml +++ b/evolinux-base/tasks/default_www.yml @@ -54,7 +54,6 @@ stat: path: /etc/nginx/sites-available check_mode: no - register: nginx_sites_available - block: @@ -87,7 +86,6 @@ stat: path: /etc/apache2/sites-available check_mode: no - register: apache_sites_available - block: diff --git a/evomaintenance/tasks/trap.yml b/evomaintenance/tasks/trap.yml index 44d0a49d..5acaa6f0 100644 --- a/evomaintenance/tasks/trap.yml +++ b/evomaintenance/tasks/trap.yml @@ -2,7 +2,6 @@ stat: path: "{{ home }}/.bash_profile" check_mode: no - register: bash_profile - name: install shell trap in {{ home }}/.bash_profile @@ -17,7 +16,6 @@ stat: path: "{{ home }}/.profile" check_mode: no - register: profile when: not bash_profile.stat.exists diff --git a/filebeat/tasks/main.yml b/filebeat/tasks/main.yml index f88b3d62..77fc10c1 100644 --- a/filebeat/tasks/main.yml +++ b/filebeat/tasks/main.yml @@ -21,13 +21,11 @@ stat: path: /usr/share/logstash/bin/logstash-plugin check_mode: no - register: logstash_plugin - name: is logstash-input-beats installed? shell: grep logstash-input-beats /usr/share/logstash/Gemfile check_mode: no - register: logstash_plugin_installed failed_when: false changed_when: false @@ -41,7 +39,6 @@ changed_when: False failed_when: False check_mode: no - register: usr_partition - name: Mount /usr in rw diff --git a/kvm-host/tasks/main.yml b/kvm-host/tasks/main.yml index ce84a0bf..a8126a8a 100644 --- a/kvm-host/tasks/main.yml +++ b/kvm-host/tasks/main.yml @@ -1,5 +1,6 @@ --- - include: ssh.yml + - include: packages.yml - name: Check if /usr is a partition @@ -9,7 +10,6 @@ changed_when: False failed_when: False check_mode: no - register: usr_partition - name: Mount /usr in rw @@ -20,4 +20,5 @@ when: usr_partition.rc == 0 - include: munin.yml + - include: images.yml diff --git a/kvm-host/tasks/ssh.yml b/kvm-host/tasks/ssh.yml index 87b1e3de..1a65aff4 100644 --- a/kvm-host/tasks/ssh.yml +++ b/kvm-host/tasks/ssh.yml @@ -12,7 +12,7 @@ changed_when: false - name: Print ssh public keys - debug: + debug: msg: "{{ ssh_keys.stdout }}" - name: Autorize other kvm ssh key @@ -26,7 +26,7 @@ - "{{ groups['hypervisors'] }}" when: item[1] != inventory_hostname -- name: Crontab for sync libvirt xml file +- name: Crontab for sync libvirt xml file cron: name: "sync libvirt xml on {{ item }}" state: present @@ -37,7 +37,7 @@ - "{{ groups['hypervisors'] }}" when: item != inventory_hostname -- name: Crontab for sync list of running vm +- name: Crontab for sync list of running vm cron: name: "sync list of libvirt running vm on {{ item }}" state: present diff --git a/minifirewall/tasks/activate.yml b/minifirewall/tasks/activate.yml index f8f6e6bf..ebe24fd6 100644 --- a/minifirewall/tasks/activate.yml +++ b/minifirewall/tasks/activate.yml @@ -4,4 +4,4 @@ dest: /etc/init.d/alert5 regexp: '^#/etc/init.d/minifirewall start' replace: '/etc/init.d/minifirewall start' - when: minifirewall_autostart == "yes" + when: minifirewall_autostart == "yes" diff --git a/mysql/tasks/datadir.yml b/mysql/tasks/datadir.yml index ebad60e8..b8d39aac 100644 --- a/mysql/tasks/datadir.yml +++ b/mysql/tasks/datadir.yml @@ -5,14 +5,12 @@ stat: path: "{{ mysql_custom_datadir }}" 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 - register: mysql_current_real_datadir_test tags: - mysql diff --git a/mysql/tasks/log2mail.yml b/mysql/tasks/log2mail.yml index c2d75b41..fb256d26 100644 --- a/mysql/tasks/log2mail.yml +++ b/mysql/tasks/log2mail.yml @@ -4,7 +4,6 @@ stat: path: /etc/log2mail/config check_mode: no - register: log2mail_config_dir tags: - mysql diff --git a/nginx-light/tasks/main.yml b/nginx-light/tasks/main.yml index 27a55931..a20a3d53 100644 --- a/nginx-light/tasks/main.yml +++ b/nginx-light/tasks/main.yml @@ -24,7 +24,7 @@ - name: Enable default vhost file: src: /etc/nginx/sites-available/default - dest: /etc/nginx/sites-enabled/default + dest: /etc/nginx/sites-enabled/default state: link notify: reload nginx tags: diff --git a/nginx/tasks/main.yml b/nginx/tasks/main.yml index a46fb3d9..caffaad1 100644 --- a/nginx/tasks/main.yml +++ b/nginx/tasks/main.yml @@ -121,7 +121,6 @@ stat: path: /etc/munin/plugin-conf.d/munin-node check_mode: no - register: stat_munin_node tags: - nginx