Adapting format to 2.4 structure and directives (#75)

icinga2-ansible-add-hosts/tasks/main.yml

 ---
 # tasks file for icinga2-ansible-add-hosts
 
-- include: icinga2_add_hosts.yml
+- import_tasks: icinga2_add_hosts.yml

icinga2-ansible-classic-ui/tasks/main.yml

 ---
 # tasks file for icinga2-ansible-classic-ui
 
-- include: icinga2_classic_ui_Debian_install.yml
+- include_tasks: icinga2_classic_ui_Debian_install.yml
   when: ansible_os_family == 'Debian'
 
-- include: icinga2_classic_ui_RedHat_install.yml
+- include_tasks: icinga2_classic_ui_RedHat_install.yml
   when: ansible_os_family == 'RedHat'
 
-- include: icinga2_classic_ui_Gentoo_install.yml
+- include_tasks: icinga2_classic_ui_Gentoo_install.yml
   when: ansible_os_family == 'Gentoo'

icinga2-ansible-no-ui/tasks/main.yml

 ---
 # tasks file for icinga2-ansible-no-ui
 
-- include: icinga2_Debian_install.yml
+- include_tasks: icinga2_Debian_install.yml
   when: ansible_os_family == 'Debian' and ansible_distribution != 'Ubuntu'
 
-- include: icinga2_Ubuntu_install.yml
+- include_tasks: icinga2_Ubuntu_install.yml
   when: ansible_os_family == 'Debian' and ansible_distribution == 'Ubuntu'
 
-- include: icinga2_RedHat_install.yml
+- include_tasks: icinga2_RedHat_install.yml
   when: ansible_os_family == 'RedHat'
 
-- include: icinga2_Gentoo_install.yml
+- include_tasks: icinga2_Gentoo_install.yml
   when: ansible_os_family == 'Gentoo'
 
-- include: icinga2_configure.yml
+- import_tasks: icinga2_configure.yml
   tags:
    - icinga2_configure

icinga2-ansible-web-ui/tasks/icinga2_web_ui_RedHat_install.yml

@@ -3,7 +3,7 @@
   yum: name=icinga2-ido-{{ icinga2_web_ui_ido }} 
        state=latest
 
-- include: icinga2_web_ui_mysql_RedHat_install.yml
+- include_tasks: icinga2_web_ui_mysql_RedHat_install.yml
   when: icinga2_web_ui_ido == "mysql"
 
 - name: Install Icinga Web on RedHat OS family

icinga2-ansible-web-ui/tasks/main.yml

 ---
 # tasks file for icinga2-ansible-web-ui
 
-- include: icinga2_web_ui_RedHat_install.yml
+- include_tasks: icinga2_web_ui_RedHat_install.yml
   when: ansible_os_family == 'RedHat'

icinga2-ansible-web2-ui/tasks/icinga2_web2_modules_install.yml

+---
+- name: Download moduels from github
+  git:
+    repo: "https://github.com/Icinga/icingaweb2-module-{{ item }}.git"
+    dest: "{{ modules_dir }}/{{ item}}"
+    update: no
+  with_items: "{{ modules_list }}"
+  ignore_errors: yes

icinga2-ansible-web2-ui/tasks/icinga2_web2_ui_Debian_install.yml

@@ -135,16 +135,3 @@
   with_items:
     - monitoring
     - translation
-
-- name: Get setup token.
-  shell: 'icingacli setup token create | sed "s/.*token is: \(.*\)/\1/g"'
-  register: setup_token
-  tags: token
-
-
-- name: Icinga Web2 Installation finished (RH)
-  debug:
-    msg="The WebUI token is {{ setup_token.stdout }}, us it at http://IP//icingaweb2/setup to continue the installation"
-  tags:
-    - icinga2-ansible-web2-ui-install
-    - token

icinga2-ansible-web2-ui/tasks/icinga2_web2_ui_RedHat_install.yml

@@ -162,15 +162,3 @@
   when:
     - ansible_pkg_mgr == "yum"
     - ansible_distribution_major_version  == "6"
-
-- name: Get setup token.
-  shell: 'icingacli setup token create | sed "s/.*token is: \(.*\)/\1/g"'
-  register: setup_token
-  tags: token
-
-- name: Icinga Web2 Installation finished (RH)
-  debug:
-    msg="The WebUI token is {{ setup_token.stdout }}, us it at http://IP//icingaweb2/setup to continue the installation"
-  tags:
-    - icinga2-ansible-web2-ui-install
-    - token

icinga2-ansible-web2-ui/tasks/main.yml

 ---
 # tasks file for icinga2-ansible-web2-ui
 
-- include: icinga2_web2_ui_RedHat_install.yml
+- include_tasks: icinga2_web2_ui_RedHat_install.yml
   when: ansible_os_family == 'RedHat'
 
-- include: icinga2_web2_ui_Debian_install.yml
+- include_tasks: icinga2_web2_ui_Debian_install.yml
   when: ansible_os_family == 'Debian'
 
-- include: icinga2_web2_modules_install.yml
+- name: Get setup token.
+  shell: 'icingacli setup token create | sed "s/.*token is: \(.*\)/\1/g"'
+  register: setup_token
+  tags: token
+
+- name: Icinga Web2 Installation finished
+  debug:
+    msg="The WebUI token is {{ setup_token.stdout }}, us it at http://IP//icingaweb2/setup to continue the installation"
+  tags:
+    - icinga2-ansible-web2-ui-install
+    - token
+
+- import_tasks: icinga2_web2_modules_install.yml

icinga2-nrpe-agent/tasks/main.yml

 ---
 # tasks file for icinga2-nrpe-agent
 
-- include: icinga2_nrpe_agent_RedHat.yml
+- include_tasks: icinga2_nrpe_agent_RedHat.yml
   when: ansible_os_family == 'RedHat' and 'monitoring_servers' not in group_names
   # NRPE Agent will be installed on clients only
 
-- include: icinga2_nrpe_agent_Debian.yml
+- include_tasks: icinga2_nrpe_agent_Debian.yml
   when: ansible_os_family == 'Debian' and 'monitoring_servers' not in group_names
   # NRPE Agent will be installed on clients only
 
-- include: icinga2_nrpe_agent_Gentoo.yml
+- include_tasks: icinga2_nrpe_agent_Gentoo.yml
   when: ansible_os_family == 'Gentoo' and 'monitoring_servers' not in group_names
   # NRPE Agent will be installed on clients only