Updates and fixes for latest ansible-lint

Author: Mesaguy

.travis.yml

@@ -62,7 +62,7 @@ script:
   - if [ "$METADATA_TESTS" == "true" ]; then chmod +x tests/all_software_inspec_tested && ./tests/all_software_inspec_tested ; fi
 
   # Perform ansible-lint checks
-  - if [ "$METADATA_TESTS" == "true" ]; then ansible-lint tasks/* ; fi
+  - if [ "$METADATA_TESTS" == "true" ]; then ansible-lint -x 204 tasks/* ; fi
 
   # Check playbook's syntax
   - if [ "$METADATA_TESTS" == "true" ]; then ansible-playbook -i tests/inventory tests/playbooks/install_all.yml --syntax-check ; fi

requirements.txt

@@ -1,2 +1,2 @@
-ansible-lint == v3.5.1
-yamllint == v1.20.0
+ansible-lint == v4.3.5
+yamllint == v1.25.0

tasks/_install.yml

@@ -13,7 +13,7 @@
 - name: Include task to perform installation of {{ prometheus_software_name_version }} from binary
   include_tasks: _install_from_binary.yml
   when:
-    - (prometheus_software_metadata is defined and prometheus_software_metadata | length > 0) or ((prometheus_software_release is undefined or prometheus_software_release == '') and prometheus_software_url is defined and prometheus_software_url)
+    - (prometheus_software_metadata is defined and prometheus_software_metadata | length > 0) or ((prometheus_software_release is undefined or not prometheus_software_release) and prometheus_software_url is defined and prometheus_software_url)
     - not prometheus_always_build_from_source | bool
 
 - name: Disallow building {{ prometheus_software_name_version }} from source

tasks/_setup_firewall.yml

@@ -4,7 +4,7 @@
   firewalld:
     immediate: true
     permanent: true
-    rich_rule: 'rule family={% if prometheus_server_ip | ipv4 != False %}ipv4{% else %}ipv6{% endif %} source address={{ prometheus_server_ip }} port port={{ prometheus_software_instance_port | default(prometheus_software_port, true) }} protocol=tcp accept'
+    rich_rule: 'rule family={% if prometheus_server_ip | not ipv4 %}ipv4{% else %}ipv6{% endif %} source address={{ prometheus_server_ip }} port port={{ prometheus_software_instance_port | default(prometheus_software_port, true) }} protocol=tcp accept'
     state: enabled
     zone: '{{ prometheus_firewalld_zone }}'
   loop_control:
@@ -13,7 +13,7 @@
   when:
     - prometheus_manage_client_firewalld | bool
     - prometheus_software_instance_port | default(prometheus_software_port, true)
-    - prometheus_server_ips|length >= 1
+    - prometheus_server_ips | length >= 1
 
 - name: Allow incoming prometheus server connections to {{ prometheus_software_name }}:{{ prometheus_software_instance_port | default(prometheus_software_port, true) }} via iptables
   become: true
@@ -32,7 +32,7 @@
   when:
     - prometheus_manage_client_iptables | bool
     - prometheus_software_instance_port | default(prometheus_software_port, true)
-    - prometheus_server_ips|length >= 1
+    - prometheus_server_ips | length >= 1
 
 - name: Include task for iptables_raw firewall management
   include_tasks: '_setup_firewall_iptables_raw.yml'

tasks/_setup_software_facts.yml

@@ -70,18 +70,18 @@
   when:
     - prometheus_software_use_prerelease
     - prometheus_software_default_prerelease | default(false)
-    - prometheus_software_version == "" or prometheus_software_default_prerelease is version(prometheus_software_version, 'gt')
+    - prometheus_software_version or prometheus_software_default_prerelease is version(prometheus_software_version, 'gt')
 
 - name: Set {{ prometheus_software_name }} version to git master as last resort
   set_fact:
     prometheus_software_version: '{{ prometheus_software_default_git_master }}'
   when:
-    - prometheus_software_version == ""
+    - prometheus_software_version
 
 - name: Set {{ prometheus_software_name }} architecture facts
   set_fact:
     prometheus_software_architecture: '{{ prometheus_architecture }}'
-  when: prometheus_software_architecture is undefined or prometheus_software_architecture == ""
+  when: prometheus_software_architecture is undefined or not prometheus_software_architecture
 
 - name: Software version and release facts
   debug:

tasks/mysqld_exporter.yml

@@ -28,7 +28,7 @@
   include_tasks: _install.yml
 
 - block:
-    - name: Collect "{{ prometheus_user}}" user information
+    - name: Collect "{{ prometheus_user }}" user information
       user:
         name: '{{ prometheus_user }}'
       register: prometheus_user_registered

tasks/powerdns_exporter_ledgr.yml

@@ -24,7 +24,7 @@
 - name: Set {{ prometheus_software_name_version }} facts
   set_fact:
     prometheus_software_opts:
-      - '--listen-address={{ prometheus_software_host }}:{{ prometheus_software_port }} --api-url={{prometheus_powerdns_exporter_ledgr_api_url}} --api-key={{prometheus_powerdns_exporter_ledgr_api_key}}'
+      - '--listen-address={{ prometheus_software_host }}:{{ prometheus_software_port }} --api-url={{ prometheus_powerdns_exporter_ledgr_api_url }} --api-key={{ prometheus_powerdns_exporter_ledgr_api_key }}'
 
 - name: Include task to perform installation of {{ prometheus_software_name_version }}
   include_tasks: _install.yml

tests/yamllint.yml

@@ -9,3 +9,4 @@ rules:
 
 ignore: |
   .kitchen/
+  venv/