Merge remote-tracking branch 'upstream/main'

.ansible-lint

@@ -1,5 +1,6 @@
 # .ansible-lint
 exclude_paths:
+  - bump-wildfly-version.sh
   - .cache/
   - .github/
   - molecule/

bump-wildfly-version.txt

@@ -0,0 +1,27 @@
+To bump the versin of Wildfly use the script below:
+
+    #!/bin/bash
+    readonly CURRENT_VERSION=${1}
+    readonly NEW_VERSION=${2}
+
+    usage() {
+      echo ''
+      echo "ex: $(basename ${0}) 29.0. 31.0.1.Final."
+    }
+
+    if [ -z "${CURRENT_VERSION}" ]; then
+        echo 'Please provide the 5 first character of the current version.'
+        usage
+        exit 1
+    fi
+
+    if [ -z "${NEW_VERSION}" ]; then
+        echo 'Please provide the new version, including .Final'
+        usage
+        exit 2
+    fi
+
+    for file_to_edit in $(grep -e "${CURRENT_VERSION}" -r roles/ molecule/  | cut -f1 -d: | sort -u)
+    do
+      sed -e "s;${CURRENT_VERSION}.*.Final;${NEW_VERSION};g" -i "${file_to_edit}"
+    done

molecule/colocated/converge.yml

@@ -2,21 +2,38 @@
 - name: Deploy first wildfly
   import_playbook: ../../playbooks/playbook.yml
   vars:
-    wildfly_node_id: wildfly-1
-    wildfly_instance_name: wildfly-1
-    wildfly_service_name: wildfly-1
+    id: 1
+    wildfly_node_id: "wildfly-{{ id }}"
+    wildfly_instance_name: "wildfly-{{ id }}"
+    wildfly_service_name: "wildfly-{{ id }}"
     wildfly_config_base: standalone-ha.xml
-    wildfly_install_workdir: "/opt/wildfly-1"
+    wildfly_install_workdir: "/opt/wildfly-{{ id }}"
     wildfly_home: "{{ wildfly_install_workdir }}/wildfly-{{ wildfly_version }}/"
+    wildfly_port_range_offset: "{{ 100 * (id -1) | int }}"
     skip_db_driver: true
+
 - name: Deploy second wildfly
   import_playbook: ../../playbooks/playbook.yml
   vars:
-    wildfly_node_id: wildfly-2
-    wildfly_instance_name: wildfly-2
-    wildfly_service_name: wildfly-2
+    id: 2
+    wildfly_node_id: "wildfly-{{ id }}"
+    wildfly_instance_name: "wildfly-{{ id }}"
+    wildfly_service_name: "wildfly-{{ id }}"
     wildfly_config_base: standalone-ha.xml
-    wildfly_install_workdir: "/opt/wildfly-2"
+    wildfly_install_workdir: "/opt/wildfly-{{ id }}"
     wildfly_home: "{{ wildfly_install_workdir }}/wildfly-{{ wildfly_version }}/"
-    wildfly_port_range_offset: 100
+    wildfly_port_range_offset: "{{ 100 * (id - 1) | int }}"
+    skip_db_driver: true
+
+- name: Deploy third wildfly
+  import_playbook: ../../playbooks/playbook.yml
+  vars:
+    id: 3
+    wildfly_node_id: "wildfly-{{ id }}"
+    wildfly_instance_name: "wildfly-{{ id }}"
+    wildfly_service_name: "wildfly-{{ id }}"
+    wildfly_config_base: standalone-ha.xml
+    wildfly_install_workdir: "/opt/wildfly-{{ id }}"
+    wildfly_home: "{{ wildfly_install_workdir }}/wildfly-{{ wildfly_version }}/"
+    wildfly_port_range_offset: "{{ 100 * (id - 1) | int }}"
     skip_db_driver: true

molecule/colocated/verify.yml

@@ -1,5 +1,5 @@
 ---
-- name: Deploy first wildfly
+- name: Validate first server
   import_playbook: ../../playbooks/validate.yml
   vars:
     wildfly_node_id: wildfly-1
@@ -9,7 +9,8 @@
     wildfly_install_workdir: "/opt/wildfly-1"
     wildfly_home: "{{ wildfly_install_workdir }}/wildfly-{{ wildfly_version }}/"
     skip_db_driver: true
-- name: Deploy second wildfly
+
+- name: Verify second server
   import_playbook: ../../playbooks/validate.yml
   vars:
     wildfly_node_id: wildfly-2
@@ -20,3 +21,15 @@
     wildfly_home: "{{ wildfly_install_workdir }}/wildfly-{{ wildfly_version }}/"
     wildfly_port_range_offset: 100
     skip_db_driver: true
+
+- name: Verify third server
+  import_playbook: ../../playbooks/validate.yml
+  vars:
+    wildfly_node_id: wildfly-3
+    wildfly_instance_name: wildfly-3
+    wildfly_service_name: wildfly-3
+    wildfly_config_base: standalone-ha.xml
+    wildfly_install_workdir: "/opt/wildfly-3"
+    wildfly_home: "{{ wildfly_install_workdir }}/wildfly-{{ wildfly_version }}/"
+    wildfly_port_range_offset: 200
+    skip_db_driver: true

molecule/prospero/converge.yml

@@ -11,11 +11,6 @@
   tasks:
     - name: "Run Prospero scenario only upstream."
       block:
-        - name: "Ensure required local user and group exists."
-          ansible.builtin.include_role:
-            name: wildfly_install
-            tasks_from: user.yml
-
         - name: "Install server using Prospero"
           ansible.builtin.include_role:
             name: wildfly_install

molecule/uninstall/converge.yml

@@ -6,3 +6,6 @@
     - vars.yml
   roles:
     - name: wildfly_uninstall
+  post_tasks:
+    - name: "Flush handlers to ensure they are executed"
+      ansible.builtin.meta: flush_handlers

molecule/uninstall/vars.yml

@@ -1,4 +1,4 @@
 ---
 wildfly_uninstall_service_name: wildfly
-wildfly_uninstall_home: /opt/wildfly/wildfly-29.0.0.Final
-wildfly_uninstall_path_to_archive: /opt/wildfly/wildfly-29.0.0.Final.zip
+wildfly_uninstall_home: /opt/wildfly/wildfly-31.0.1.Final
+wildfly_uninstall_path_to_archive: /opt/wildfly/wildfly-31.0.1.Final.zip

roles/wildfly_driver/README.md

@@ -13,7 +13,7 @@ Role Defaults
 |:---------|:------------|:--------|
 |`wildfly_driver_module_dir`| Path for module installation | `{{ wildfly_home }}/modules/{{ wildfly_driver_module_name | replace('.', '/') }}/main` |
 |`wildfly_driver_jar_installation_path`| Path for jdbc driver installation | `{{ wildfly_driver_module_dir }}/{{ wildfly_driver_jar_filename }}` |
-|`wildfly_version`| Wildfly version to install | `29.0.0.Final` |
+|`wildfly_version`| Wildfly version to install | `31.0.1.Final` |
 |`wildfly_home`| Wildfly installation directory | `/opt/wildfly/wildfly-{{ wildfly_version }}/` |
 |`wildfly_user`| posix user account for wildfly | `wildfly` |
 |`wildfly_group`| posix group for wildfly | `{{ wildfly_user }}` |

roles/wildfly_driver/defaults/main.yml

@@ -1,7 +1,7 @@
 ---
 wildfly_user: 'wildfly'
 wildfly_group: "{{ wildfly_user }}"
-wildfly_version: '29.0.0.Final'
+wildfly_version: '31.0.1.Final'
 wildfly_home: "/opt/wildfly/wildfly-{{ wildfly_version }}/"
 wildfly_driver_module_dir: "{{ wildfly_home }}/modules/{{ wildfly_driver.module_name | replace('.', '/') }}/main"
 wildfly_driver_jar_installation_path: "{{ wildfly_driver_module_dir }}/{{ wildfly_driver_jar_filename }}"

roles/wildfly_driver/meta/argument_specs.yml

@@ -26,7 +26,7 @@ argument_specs:
                 description: "Name for the jdbc driver module"
                 type: "str"
             wildfly_version:
-                default: "29.0.0.Final"
+                default: "31.0.1.Final"
                 description: "Wildfly version to install"
                 type: "str"
             wildfly_home:

roles/wildfly_install/README.md

@@ -15,7 +15,7 @@ Role Defaults
 
 | Variable | Description | Default |
 |:---------|:------------|:--------|
-|`wildfly_version`| Wildfly version to install | `29.0.0.Final` |
+|`wildfly_version`| Wildfly version to install | `31.0.1.Final` |
 |`wildfly_archive_filename`| Wildfly download archive name | `wildfly-{{ wildfly_version }}.zip` |
 |`wildfly_download_baseurl`| Base URL for wildfly download | `https://github.com/wildfly/wildfly/releases/download` |
 |`wildfly_install_workdir`| Wildfly installation directory (where the server files are unzipped) | `/opt/wildfly/` |

roles/wildfly_install/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-wildfly_version: '29.0.0.Final'
+wildfly_version: '31.0.1.Final'
 wildfly_archive_filename: "wildfly-{{ wildfly_version }}.zip"
 wildfly_download_baseurl: 'https://github.com/wildfly/wildfly/releases/download'
 wildfly_install_workdir: '/opt/wildfly/'

roles/wildfly_install/meta/argument_specs.yml

@@ -2,7 +2,7 @@ argument_specs:
     main:
         options:
             wildfly_version:
-                default: "29.0.0.Final"
+                default: "31.0.1.Final"
                 description: "Wildfly version to install"
                 type: "str"
             wildfly_archive_filename:

roles/wildfly_prospero/README.md

@@ -35,30 +35,17 @@ Example Playbook
 - name: Playbook to install Wildfly using Prospero
   hosts: all
   vars:
-    wildfly_install_user: 'wildfly'
-    wildfly_install_group: "{{ wildfly_install_user }}"
     wildfly_install_use_prospero: True
-    wildfly_prospero_scenario_enable: True
   collections:
     - middleware_automation.wildfly
   tasks:
-    - name: "Run Prospero scenario only upstream."
-      block:
-        - name: "Ensure required local user and group exists."
-          ansible.builtin.include_role:
-            name: wildfly_install
-            tasks_from: user.yml
-
-        - name: "Install server using Prospero"
-          ansible.builtin.include_role:
-            name: wildfly_install
-
-        - name: "Run server with systemd"
-          ansible.builtin.include_role:
-            name: wildfly_systemd
-      when:
-        - wildfly_prospero_scenario_enable is defined and wildfly_prospero_scenario_enable
+    - name: "Install server using Prospero"
+      ansible.builtin.include_role:
+        name: wildfly_install
 
+    - name: "Run server with systemd"
+      ansible.builtin.include_role:
+        name: wildfly_systemd
 ```
 
 Author Information

roles/wildfly_systemd/README.md

@@ -18,7 +18,7 @@ Role Defaults
 |:---------|:------------|:--------|
 |`wildfly_user`| posix user account for wildfly service | `wildfly` |
 |`wildfly_group`| posix group for wildfly service | `{{ wildfly_user }}` |
-|`wildfly_version`| Wildfly version to install | `29.0.0.Final` |
+|`wildfly_version`| Wildfly version to install | `31.0.1.Final` |
 |`wildfly_install_workdir`| Wildfly installation directory (where the server files are unzipped) | `/opt/wildfly/` |
 |`wildfly_home`| Wildfly installation directory (WILDFLY_HOME) | `{{ wildfly_install_workdir }}wildfly-{{ wildfly_version }}/` |
 |`wildfly_config_base`| Base standalone.xml config for instance | `standalone.xml` unless `wildfly_config_custom_file` is used |

roles/wildfly_systemd/defaults/main.yml

@@ -1,7 +1,7 @@
 ---
 wildfly_user: 'wildfly'
 wildfly_group: "{{ wildfly_user }}"
-wildfly_version: '29.0.0.Final'
+wildfly_version: '31.0.1.Final'
 wildfly_install_workdir: '/opt/wildfly/'
 wildfly_home: "{{ wildfly_install_workdir }}wildfly-{{ wildfly_version }}"
 wildfly_config_base: 'standalone.xml'

roles/wildfly_systemd/meta/argument_specs.yml

@@ -18,7 +18,7 @@ argument_specs:
                 description: "posix group for wildfly service"
                 type: "str"
             wildfly_version:
-                default: "29.0.0.Final"
+                default: "31.0.1.Final"
                 description: "Wildfly version to install"
                 type: "str"
             wildfly_install_workdir:

roles/wildfly_uninstall/README.md

@@ -10,7 +10,7 @@ Role Defaults
 | Variable | Description | Default |
 |:---------|:------------|:--------|
 |`wildfly_uninstall_require_privileges_escalation`| Specifiy if the uninstallation process requires privileges escalation | `True` |
-|`wildfly_uninstall_instance_name`| Instance name of the server to uninstall | `{{ instance_name | default('wildfly') }}` |
+|`wildfly_uninstall_service_name`| Instance name of the server to uninstall | `{{ instance_name | default('wildfly') }}` |
 |`wildfly_uninstall_home`| Path to server home | `{{ wildfly_home }}` |
 |`wildfly_uninstall_systemd_service_file`| Path to the systemd configuration file associated to the server | `/usr/lib/systemd/system/{{ wildfly_uninstall_service_name }}.service` |
 |`wildfly_uninstall_systemd_service_conf_file`| Path to the env file used by the systemd service associated to the server | `/etc/{{ wildfly_uninstall_service_name }}.conf` |
@@ -38,8 +38,8 @@ Role Variables
   gather_facts: no
   vars:
     wildfly_uninstall_service_name: wildfly
-    wildfly_uninstall_home: /opt/wildfly/wildfly-29.0.0.Final
-    wildfly_uninstall_path_to_archive: /opt/wildfly/wildfly-29.0.0.Final.zip
+    wildfly_uninstall_home: /opt/wildfly/wildfly-31.0.1.Final
+    wildfly_uninstall_path_to_archive: /opt/wildfly/wildfly-31.0.1.Final.zip
   roles:
     - name: wildfly_uninstall
 ```

roles/wildfly_uninstall/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 wildfly_uninstall_require_privileges_escalation: true
-wildfly_uninstall_instance_name: "{{ instance_name | default('wildfly') }}"
+wildfly_uninstall_service_name: "{{ wildfly_service_name | default('wildfly') }}"
 wildfly_uninstall_home: "{{ wildfly_home }}"
 wildfly_uninstall_systemd_service_file: "/usr/lib/systemd/system/{{ wildfly_uninstall_service_name }}.service"
 wildfly_uninstall_systemd_service_conf_file: "/etc/{{ wildfly_uninstall_service_name }}.conf"

roles/wildfly_uninstall/handlers/systemd.yml

@@ -0,0 +1,4 @@
+---
+- name: "Systemd Daemon Reload"
+  ansible.builtin.systemd:
+    daemon_reload: yes

roles/wildfly_uninstall/meta/argument_specs.yml

@@ -8,7 +8,7 @@ argument_specs:
                 type: "bool"
 
             # line 3 of defaults/main.yml
-            wildfly_uninstall_instance_name:
+            wildfly_uninstall_service_name:
                 default: "{{ instance_name | default('wildfly') }}"
                 description: "Instance name of the server to uninstall"
                 type: "str"

roles/wildfly_uninstall/tasks/main.yml

@@ -25,13 +25,17 @@
         path: "{{ wildfly_uninstall_systemd_service_conf_file }}"
       when:
         - wildfly_uninstall_systemd_service_conf_file
+      notify:
+        - "Systemd Daemon Reload"
 
     - name: "Delete systemd env file ({{ wildfly_uninstall_systemd_service_file }})."
       ansible.builtin.file:
         state: absent
         path: "{{ wildfly_uninstall_systemd_service_file }}"
       when:
         - wildfly_uninstall_systemd_service_file
+      notify:
+        - "Systemd Daemon Reload"
 
     - name: "Delete user - if requested {{ wildfly_uninstall_delete_username }}"
       ansible.builtin.user:

roles/wildfly_utils/defaults/main.yml

@@ -5,7 +5,7 @@ jboss_cli_apply_cp_default_conflict_default: '--override-all'
 wildfly_no_restart_after_patch:  False
 wildfly_user: wildfly
 wildfly_group: "{{ wildfly_user }}"
-wildfly_version: '29.0.0.Final'
+wildfly_version: '31.0.1.Final'
 wildfly_install_workdir: '/opt/wildfly/'
 wildfly_home: "{{ wildfly_install_workdir }}wildfly-{{ wildfly_version }}/"
 jboss_home: "{{ wildfly_home }}"

roles/wildfly_utils/meta/argument_specs.yml

@@ -26,7 +26,7 @@ argument_specs:
                 description: "posix group for wildfly"
                 type: "str"
             wildfly_version:
-                default: "29.0.0.Final"
+                default: "31.0.1.Final"
                 description: "Wildfly version to install"
                 type: "str"
             wildfly_install_workdir:

roles/wildfly_validation/defaults/main.yml

@@ -5,7 +5,7 @@ wildfly_service_name: wildfly
 wildfly_http_port: 8080
 wildfly_https_port: 8443
 wildfly_controller_port: 9990
-wildfly_version: '29.0.0.Final'
+wildfly_version: '31.0.1.Final'
 wildfly_install_workdir: '/opt/wildfly/'
 wildfly_home: "{{ wildfly_install_workdir }}wildfly-{{ wildfly_version }}/"
 wildfly_validation_systemd_pidfile: "{{ wildfly_home }}/standalone/{{ wildfly_service_name }}.pid"

roles/wildfly_validation/meta/argument_specs.yml

@@ -22,7 +22,7 @@ argument_specs:
                 description: "Server HTTPS port"
                 type: "str"
             wildfly_version:
-                default: "29.0.0.Final"
+                default: "31.0.1.Final"
                 description: "Wildfly version to install"
                 type: "str"
             wildfly_install_workdir: