lint: for a fistful of fixes

Author: rpelisse

roles/wildfly_install/meta/argument_specs.yml

@@ -76,10 +76,11 @@ argument_specs:
                 description: "Enable install of Red Hat JBoss EAP"
                 type: "bool"
             eap_install_use_prospero:
-                default: "{{ (eap_version is version('8.0.0', '>=', strict=true)) | ternary(true,false) }}"
-                description:
+                default: "{{ (eap_version is version('8.0.0', '>=', strict=true)) | ternary(true, false) }}"
+                description: "Whether or not installation should use JBoss Installation Manager"
+                type: "str"
             eap_apply_cp:
-                default: "{{ (eap_version is version('8.0.0', '>=', strict=true)) | ternary(false,true) }}"
+                default: "{{ (eap_version is version('8.0.0', '>=', strict=true)) | ternary(false, true) }}"
                 description: "Whether to apply the latest cumulative patch on top of baseline version"
                 type: "bool"
             eap_version:
@@ -139,7 +140,7 @@ argument_specs:
                 description: "Specifiy if Ansible should skip the check that the provided OpenJDK version is supported for the EAP server used."
                 type: bool
             eap_supported_configuration:
-                type: struct
+                type: json
                 description: "Supported OpenJDK and RHEL version for EAP"
                 default:
                   eap7:

roles/wildfly_install/tasks/eap_supported_configuration.yml

@@ -8,7 +8,7 @@
 
 - name: "Determine supported configurations for EAP {{ eap_version }}"
   ansible.builtin.set_fact:
-    supported_configuration: "{{ eap_supported_configuration['eap' + eap_version[:1] ] }}"
+    supported_configuration: "{{ eap_supported_configuration['eap' + eap_version[:1]] }}"
 
 - name: "Ensure target RHEL version is supported: {{ supported_configuration.rhel }}"
   ansible.builtin.assert:

roles/wildfly_install/tasks/install.yml

@@ -71,6 +71,8 @@
   become: true
 
 - name: Perform installation
+  when:
+    - not wildfly_install.rpm is defined
   block:
     - name: "Check target archive: {{ full_path_to_archive }}"
       ansible.builtin.stat:
@@ -115,8 +117,6 @@
         msg: "{{ wildfly_install.home }} already exists and version unchanged, skipping decompression"
       when:
         - not new_version_downloaded.changed and path_to_workdir.stat.exists
-  when:
-    - not wildfly_install.rpm is defined
 
 - name: "Read information on server home directory: {{ wildfly_install.home }}"
   ansible.builtin.stat:

roles/wildfly_install/tasks/prereqs.yml

@@ -68,15 +68,15 @@
 
 - name: "Add JDK package {{ wildfly_install.java.package_name }} to packages list"
   ansible.builtin.set_fact:
-    wildfly_prereqs_packages: "{{ wildfly_prereqs_packages + [ wildfly_install.java.package_name ] }}"
+    wildfly_prereqs_packages: "{{ wildfly_prereqs_packages + [wildfly_install.java.package_name] }}"
   when:
     - wildfly_install.java is defined
     - wildfly_install.java.package_name is defined
     - wildfly_install.java.package_name | length > 0
 
 - name: "Add selinux package {{ wildfly_install.java.package_name }} to packages list"
   ansible.builtin.set_fact:
-    wildfly_prereqs_packages: "{{ wildfly_prereqs_packages + [ 'policycoreutils' ] }}"
+    wildfly_prereqs_packages: "{{ wildfly_prereqs_packages + ['policycoreutils'] }}"
   when:
     - wildfly_selinux_enabled
 

roles/wildfly_subs/tasks/disable_repo.yml

@@ -8,6 +8,10 @@
     fail_msg: "Missing required parameters"
 
 - name: "Uninstall group package"
+  when:
+    - wildfly_subs is defined
+    - wildfly_subs.skip_group_remove is defined
+    - not wildfly_subs.skip_group_remove
   block:
 
     - name: "Ensure group package {{ eap_group_install_name }} is removed"
@@ -24,12 +28,11 @@
         - wildfly_subs.remove_root_dir is defined
         - wildfly_subs.remove_root_dir
 
+- name: "Disable repository"
   when:
     - wildfly_subs is defined
-    - wildfly_subs.skip_group_remove is defined
-    - not wildfly_subs.skip_group_remove
-
-- name: "Disable repository"
+    - wildfly_subs.check_repo_disabled is defined
+    - wildfly_subs.check_repo_disabled
   block:
     - name: "Check that required parameters are provided"
       ansible.builtin.assert:
@@ -50,8 +53,3 @@
     - name: "Ensure JBoss EAP {{ eap_version }} repos are disabled."
       ansible.builtin.command: "subscription-manager repos --disable={{ eap_repos_name }}"
       changed_when: False
-
-  when:
-    - wildfly_subs is defined
-    - wildfly_subs.check_repo_disabled is defined
-    - wildfly_subs.check_repo_disabled

roles/wildfly_subs/tasks/enable_repo.yml

@@ -23,6 +23,9 @@
     - not eap_repo_state_file is defined
 
 - name: "Enable repository."
+  when:
+   - installed_eap_source is defined
+   - installed_eap_source
   block:
     - name: "Ensure JBoss repos for {{ eap_version }} are enabled."
       ansible.builtin.command: "subscription-manager repos --enable={{ eap_repo_name }}"
@@ -47,7 +50,3 @@
       ansible.builtin.command: "dnf groupinstall -y {{ eap_group_install_name }}"
       args:
         creates: /opt/rh/eap7/
-
-  when:
-   - installed_eap_source is defined
-   - installed_eap_source

roles/wildfly_systemd/defaults/main.yml

@@ -21,8 +21,7 @@ wildfly_service_config_file_template: 'templates/wfly.conf.j2'
 wildfly_service_config_file_location: '/etc/sysconfig'
 
 wildfly_service_systemd_env_file: "{{ wildfly_service_config_file_location }}/{{ wildfly_service_name }}{{ wildfly_systemd_conf_file_suffix }}"
-wildfly_service_systemd_file: "{{ wildfly_systemd_service_config_location}}/{{ wildfly_service_name }}{{ wildfly_systemd_service_config_file_suffix }}"
-
+wildfly_service_systemd_file: "{{ wildfly_systemd_service_config_location }}/{{ wildfly_service_name }}{{ wildfly_systemd_service_config_file_suffix }}"
 wildfly_enable_yml_config: false
 wildfly_yml_configs: []
 wildfly_yml_configs_repository:

roles/wildfly_systemd/tasks/systemd.yml

@@ -136,9 +136,7 @@
       register: daemon_reload_env
       vars:
         wildfly_rpm_java_home: "{{ rpm_java_home if ansible_os_family == 'RedHat' else rpm_java_home_other.stdout }}"
-        wildfly_yml_configs_str: "'-y={{ wildfly_yml_configs | flatten | map('regex_replace', '.j2$', '')\
-                                         | map('regex_replace', '^', basedir + '/') | list | join(':') }}'"
-
+        wildfly_yml_configs_str: "'-y={{ wildfly_yml_configs | flatten | map('regex_replace', '.j2$', '') | map('regex_replace', '^', basedir + '/') | list | join(':') }}'"
     - name: "Deploy Systemd unit for service: {{ wildfly_service_systemd_file }}"
       ansible.builtin.template:
         src: "{{ wildfly_systemd_service_config_file_template }}"
@@ -152,7 +150,7 @@
         seuser: system_u
       register: daemon_reload
       vars:
-        jboss_cli_deploy_controller: "{{ wildfly_systemd_jboss_cli_controller_host }}:{{ (wildfly_systemd_jboss_cli_controller_port | default(9990) | int) +(wildfly_port_range_offset | int) }}"
+        jboss_cli_deploy_controller: "{{ wildfly_systemd_jboss_cli_controller_host }}:{{ (wildfly_systemd_jboss_cli_controller_port | default(9990) | int) + (wildfly_port_range_offset | int) }}"
 
     - name: "Perform daemon-reload to ensure the changes are picked up"
       ansible.builtin.systemd:

roles/wildfly_utils/tasks/download_from_rhn.yml

@@ -12,7 +12,7 @@
     client_id: "{{ rhn_username }}"
     client_secret: "{{ rhn_password }}"
     product_type: DISTRIBUTION
-    product_version: "{{ eap_version | regex_replace('([0-9]+)[.]([0-9]+)[.][0-9]+[.]?([A-Za-z]+)?', '\\1.\\2 \\3')  }}"
+    product_version: "{{ eap_version | regex_replace('([0-9]+)[.]([0-9]+)[.][0-9]+[.]?([A-Za-z]+)?', '\\1.\\2 \\3') }}"
     product_category: "{{ eap_product_category }}"
   register: rhn_products
   no_log: "{{ omit_rhn_output | default(true) }}"

roles/wildfly_utils/tasks/keycloak_adapter.yml

@@ -36,6 +36,9 @@
   delegate_to: localhost
 
 - name: "Check if JBoss Network API access is needed."
+  when:
+    - local_archive_path is defined and local_archive_path.stat is defined
+    - local_archive_path.stat.exists is defined and not local_archive_path.stat.exists
   block:
     - name: Retrieve product download using JBoss Network API
       middleware_automation.common.product_search:
@@ -73,9 +76,6 @@
       when:
         - remote_archive_path is defined
         - not remote_archive_path.stat.exists
-  when:
-    - local_archive_path is defined and local_archive_path.stat is defined
-    - local_archive_path.stat.exists is defined and not local_archive_path.stat.exists
 
 - name: "Check downloaded archive: {{ patch_filename }}."
   ansible.builtin.stat: