Code style fixes & cleanup -> towards fully automated install includi…

…ng module selection (#101)

* First steps into bringing the playbooks in line with best practices

* Cleaned up unused file

Signed-off-by: Mark Laagland <mark@taggle-it.nl>

* Removed undocumented and defective PostgreSQL option

Function prevents setting up MySQL, but then goes on to create a MySQL database and MySQL user and import a schema. Clearly this functionality is far from complete (and should be implemented in a different manner anyway)

Signed-off-by: Mark Laagland <mark@taggle-it.nl>

* Simplified icinga2-ansible-web2-ui role and combined scripts for different OS families where possible, improving maintainability.

Signed-off-by: Mark Laagland <mark@taggle-it.nl>

* Removed incomplete support for RedHat OS family version 6.

Not only is this version very outdated (though admittedly still in the last phase of free support), the support in this playbook could have never worked since it would first install (php and) php-fpm for php version 7.0, before editing a configuration file for php 7.1.

Signed-off-by: Mark Laagland <mark@taggle-it.nl>

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

@@ -2,11 +2,13 @@
 # handlers file for icinga2-ansible-add-hosts
 
 - name: restart icinga2
-  service: name=icinga2
-           state=restarted
-           enabled=yes
+  service:
+    name: icinga2
+    state: restarted
+    enabled: yes
 
 - name: reload icinga2
-  service: name=icinga2
-           state=reloaded
-           enabled=yes
+  service:
+    name: icinga2
+    state: reloaded
+    enabled: yes

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

@@ -1,10 +1,11 @@
 ---
 - name: Copy Host Definitions
-  template: src=hosts_template.j2
-            dest={{ icinga2_hosts_dir }}/{{ hostvars[item]['ansible_fqdn'] }}.conf
-            owner=root
-            group=root
-            mode=0644
-  with_items: "{{ groups['all'] }}"
+  template:
+    src: hosts_template.j2
+    dest: "{{ icinga2_hosts_dir }}/{{ hostvars[item]['ansible_fqdn'] }}.conf"
+    owner: root
+    group: root
+    mode: 0644
+  loop: "{{ groups['all'] }}"
   notify:
    - reload icinga2

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

@@ -2,16 +2,19 @@
 # handlers file for icinga2-ansible-classic-ui
 
 - name: restart httpd
-  service: name=httpd
-           state=restarted
-           enabled=yes
+  service:
+    name: httpd
+    state: restarted
+    enabled: yes
 
 - name: restart apache2
-  service: name=apache2
-           state=restarted
-           enabled=yes
+  service:
+    name: apache2
+    state: restarted
+    enabled: yes
 
 - name: restart icinga2
-  service: name=icinga2
-           state=restarted
-           enabled=yes
+  service:
+    name: icinga2
+    state: restarted
+    enabled: yes

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

@@ -1,19 +1,21 @@
 ---
 - name: Install Icinga Classic UI on Debian OS family
-  apt: pkg={{ item }}
-       state=latest
-       update_cache=yes
-       cache_valid_time=30
-  with_items: "{{ icinga2_classic_ui_pkg }}"
+  apt:
+    pkg: "{{ icinga2_classic_ui_pkg }}"
+    state: latest
+    update_cache: yes
+    cache_valid_time: 30
 
 - name: Configure a password for icingaadmin user
-  htpasswd: name=icingaadmin
-            state=present
-            path={{ htpasswd_deb }}
-            create=no
-            password={{ icinga2_classic_ui_passwd }}
+  htpasswd:
+    name: icingaadmin
+    state: present
+    path: "{{ htpasswd_deb }}"
+    create: no
+    password: "{{ icinga2_classic_ui_passwd }}"
   notify:
    - restart apache2
 
 - name: Icinga Classic UI Installation finished (Debian)
-  debug: msg="Login at http://IP/icinga2-classicui with user icingaadmin and password {{ icinga2_classic_ui_passwd }}"
+  debug:
+    msg: "Login at http://IP/icinga2-classicui with user icingaadmin and password {{ icinga2_classic_ui_passwd }}"