-

Welcome to Wildfly Collection documentation

+

Welcome to WildFly Collection documentation

Pick collection version:

    diff --git a/docs/conf.py b/docs/conf.py index 92d20bc3..18f8b2d2 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -20,7 +20,7 @@ # -- Project information ----------------------------------------------------- -project = 'Wildfly Ansible Collection' +project = 'WildFly Ansible Collection' copyright = '{y}, Red Hat, Inc.'.format(y=datetime.date.today().year) author = 'Red Hat, Inc.' @@ -109,7 +109,7 @@ # -- Options for HTMLHelp output --------------------------------------------- # Output file base name for HTML help builder. -htmlhelp_basename = 'WildflyCollectionDoc' +htmlhelp_basename = 'WildFlyCollectionDoc' # -- Options for LaTeX output ------------------------------------------------ @@ -136,7 +136,7 @@ # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - (master_doc, 'WildflyCollection.tex', 'Red Hat JBoss EAP Ansible Collection Documentation', + (master_doc, 'WildFlyCollection.tex', 'Red Hat JBoss EAP Ansible Collection Documentation', 'Red Hat, Inc.', 'manual'), ] @@ -157,8 +157,8 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'WildflyCollection', 'Red Hat JBoss EAP Ansible Collection Documentation', - author, 'WildflyCollection', 'One line description of project.', + (master_doc, 'WildFlyCollection', 'Red Hat JBoss EAP Ansible Collection Documentation', + author, 'WildFlyCollection', 'One line description of project.', 'Miscellaneous'), ] diff --git a/docs/index.rst b/docs/index.rst index 3c88d6d5..4d6fbdb0 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,6 +1,6 @@ -.. Red Hat middleware_automation Wildfly Ansible Collection documentation main file +.. Red Hat middleware_automation WildFly Ansible Collection documentation main file -Welcome to Wildfly Collection documentation +Welcome to WildFly Collection documentation =========================================== .. toctree:: @@ -31,7 +31,7 @@ Welcome to Wildfly Collection documentation Infinispan / Red Hat Data Grid Keycloak / Red Hat Single Sign-On - Wildfly / Red Hat JBoss EAP + WildFly / Red Hat JBoss EAP Tomcat / Red Hat JWS ActiveMQ / Red Hat AMQ Broker Kafka / Red Hat AMQ Streams diff --git a/docs/testing.md b/docs/testing.md index 151fd2b0..7a3f158c 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -19,7 +19,7 @@ at every collection release to ensure non-breaking changes and consistent behavi The repository are: - [Flange demo](https://github.com/ansible-middleware/flange-demo) - A deployment of Wildfly cluster integrated with keycloak and infinispan. + A deployment of WildFly cluster integrated with keycloak and infinispan. - [CrossDC keycloak demo](https://github.com/ansible-middleware/wildfly-cluster-demo) A clustered installation of EAP. diff --git a/galaxy.yml b/galaxy.yml index 76ce2e20..c0a519f8 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -1,7 +1,7 @@ --- namespace: middleware_automation name: wildfly -version: "1.5.7" +version: "1.5.8" readme: README.md authors: - Romain Pelisse @@ -9,7 +9,7 @@ authors: - Harsha Cherukuri - Guido Grazioli - Ranabir Chakraborty -description: Enable Ansible to provisioning JBoss EAP or Wildfly instances. +description: Enable Ansible to provisioning JBoss EAP or WildFly instances. license_file: "LICENSE" tags: - java diff --git a/molecule/custom_config_file/vars.yml b/molecule/custom_config_file/vars.yml index bb9d6489..8a5e2b83 100644 --- a/molecule/custom_config_file/vars.yml +++ b/molecule/custom_config_file/vars.yml @@ -1,5 +1,5 @@ wildfly_config_custom_file: files/wildfly-custom.xml -wildfly_version: '35.0.0.Final' +wildfly_version: '37.0.0.Final' wildfly_archive_filename: "wildfly-{{ wildfly_version }}.zip" wildfly_download_baseurl: 'https://github.com/wildfly/wildfly/releases/download' wildfly_install_download_url: "{{ wildfly_download_baseurl }}/{{ wildfly_version }}/{{ wildfly_archive_filename }}" diff --git a/molecule/custom_config_file/verify.yml b/molecule/custom_config_file/verify.yml index 1cd3c501..a443c92a 100644 --- a/molecule/custom_config_file/verify.yml +++ b/molecule/custom_config_file/verify.yml @@ -13,11 +13,22 @@ when: - wildfly_apps is defined and wildfly_apps | length > 0 - - name: "Verify that state is consistent" + - name: "STEP 1: Add the 'test' system property (The Action)" + ansible.builtin.include_role: + name: wildfly_utils + tasks_from: jboss_cli.yml + vars: + jboss_cli_query: "/system-property=test:add(value=testvalue)" + + - name: "STEP 2: Verify the property using wildfly_validation_queries (The Validation)" ansible.builtin.include_role: name: wildfly_validation vars: - - eap_validation_queries: - - { query: '/system-property=test:read-attribute(name=value)', expected_result: 'testvalue', expected_result_undefined: False} + wildfly_validation_queries: + - { + query: '/system-property=test:read-attribute(name=value)', + expected_result: 'testvalue', + expected_result_undefined: False + } when: - not eap_enable is defined diff --git a/molecule/prospero/molecule.yml b/molecule/prospero/molecule.yml index ef56db35..19bf8adb 100644 --- a/molecule/prospero/molecule.yml +++ b/molecule/prospero/molecule.yml @@ -3,7 +3,7 @@ driver: name: ${CI_DRIVER:-docker} platforms: - name: instance - image: registry.access.redhat.com/ubi8/ubi-init:latest + image: registry.access.redhat.com/ubi9/ubi-init:latest pre_build_image: true privileged: true command: "/usr/sbin/init" diff --git a/molecule/prospero/verify.yml b/molecule/prospero/verify.yml index 8f4949bc..28abebc0 100644 --- a/molecule/prospero/verify.yml +++ b/molecule/prospero/verify.yml @@ -7,8 +7,6 @@ wildfly_prospero_install_dir: /opt/prospero wildfly_validation_install_use_prospero: true wildfly_validation_check_prospero_install: false - vars_files: - - vars.yml collections: - middleware_automation.wildfly tasks: diff --git a/molecule/uninstall/vars.yml b/molecule/uninstall/vars.yml index 6747605b..2c78acc0 100644 --- a/molecule/uninstall/vars.yml +++ b/molecule/uninstall/vars.yml @@ -1,5 +1,5 @@ --- wildfly_uninstall_service_name: wildfly -wildfly_uninstall_version: '35.0.0.Final' +wildfly_uninstall_version: '37.0.0.Final' wildfly_uninstall_home: "/opt/wildfly/wildfly-{{ wildfly_uninstall_version }}" wildfly_uninstall_path_to_archive: "/opt/wildfly/wildfly-{{ wildfly_uninstall_version }}.zip" diff --git a/molecule/uninstall/verify.yml b/molecule/uninstall/verify.yml index 5cbda335..76a85939 100644 --- a/molecule/uninstall/verify.yml +++ b/molecule/uninstall/verify.yml @@ -9,7 +9,7 @@ - name: Populate service facts ansible.builtin.service_facts: - - name: "Display state of the Wildfly service" + - name: "Display state of the WildFly service" ansible.builtin.debug: msg: "{{ ansible_facts.services['wildfly.service'] }}" diff --git a/playbooks/playbook.yml b/playbooks/playbook.yml index 28163513..578f3f91 100644 --- a/playbooks/playbook.yml +++ b/playbooks/playbook.yml @@ -1,5 +1,5 @@ --- -- name: Ensure Wildfly is install and running as a service +- name: Ensure WildFly is install and running as a service hosts: all vars_files: - vars/vars.yml diff --git a/roles/wildfly_driver/README.md b/roles/wildfly_driver/README.md index 884226f2..f0ee9e40 100644 --- a/roles/wildfly_driver/README.md +++ b/roles/wildfly_driver/README.md @@ -13,8 +13,8 @@ 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 | `35.0.0.Final` | -|`wildfly_home`| Wildfly installation directory | `/opt/wildfly/wildfly-{{ wildfly_version }}/` | +|`wildfly_version`| WildFly version to install | `37.0.0.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 }}` | diff --git a/roles/wildfly_driver/defaults/main.yml b/roles/wildfly_driver/defaults/main.yml index 82def0d5..a1db80f7 100644 --- a/roles/wildfly_driver/defaults/main.yml +++ b/roles/wildfly_driver/defaults/main.yml @@ -1,7 +1,7 @@ --- wildfly_user: 'wildfly' wildfly_group: "{{ wildfly_user }}" -wildfly_version: '35.0.0.Final' +wildfly_version: '37.0.0.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 }}" diff --git a/roles/wildfly_driver/meta/argument_specs.yml b/roles/wildfly_driver/meta/argument_specs.yml index f9677994..8ac21e83 100644 --- a/roles/wildfly_driver/meta/argument_specs.yml +++ b/roles/wildfly_driver/meta/argument_specs.yml @@ -26,12 +26,12 @@ argument_specs: description: "Name for the jdbc driver module" type: "str" wildfly_version: - default: "35.0.0.Final" - description: "Wildfly version to install" + default: "37.0.0.Final" + description: "WildFly version to install" type: "str" wildfly_home: default: "/opt/wildfly/wildfly-{{ wildfly_version }}/" - description: "Wildfly installation directory" + description: "WildFly installation directory" type: "str" wildfly_user: default: "wildfly" diff --git a/roles/wildfly_install/README.md b/roles/wildfly_install/README.md index 2c744dc8..039f7ba6 100644 --- a/roles/wildfly_install/README.md +++ b/roles/wildfly_install/README.md @@ -1,7 +1,7 @@ wildfly install role ==================== -A role to automate the download and installation of the Wildfly JEE server. +A role to automate the download and installation of the WildFly JEE server. Requirements @@ -15,12 +15,12 @@ Role Defaults | Variable | Description | Default | |:---------|:------------|:--------| -|`wildfly_version`| Wildfly version to install | `35.0.0.Final` | -|`wildfly_archive_filename`| Wildfly download archive name | `wildfly-{{ wildfly_version }}.zip` | +|`wildfly_version`| WildFly version to install | `37.0.0.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/` | -|`wildfly_home`| Wildfly installation directory (WILDFLY_HOME) | `{{ wildfly_install_workdir }}wildfly-{{ wildfly_version }}/` | -|`wildfly_install_download_url`| Wildfly download URL | `{{ wildfly_download_baseurl }}/{{ wildfly_version }}/{{ wildfly_archive_filename }}` | +|`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_install_download_url`| WildFly download URL | `{{ wildfly_download_baseurl }}/{{ wildfly_version }}/{{ wildfly_archive_filename }}` | |`wildfly_archive_dir`| Target download directory | `{{ wildfly_install_workdir }}` | |`wildfly_config_base`| Base standalone.xml config for instance | `standalone.xml` unless `wildfly_config_custom_file` is used | |`wildfly_config_custom_file`| Custom standalone.xml config to be copied to target instance and used as base | `''` | @@ -42,7 +42,7 @@ Role Variables ### Default Install -Installs the default version of Wildfly to the default location with the default user. +Installs the default version of WildFly to the default location with the default user. ``` --- @@ -56,7 +56,7 @@ Installs the default version of Wildfly to the default location with the default ### Explicit Location and Version -Older Wildfly versions can be download from outside Github. +Older WildFly versions can be download from outside Github. ``` --- diff --git a/roles/wildfly_install/defaults/main.yml b/roles/wildfly_install/defaults/main.yml index d9271fa9..c1022c25 100644 --- a/roles/wildfly_install/defaults/main.yml +++ b/roles/wildfly_install/defaults/main.yml @@ -1,5 +1,5 @@ --- -wildfly_version: '35.0.0.Final' +wildfly_version: '37.0.0.Final' wildfly_archive_filename: "wildfly-{{ wildfly_version }}.zip" wildfly_archive_filename_on_controller: true wildfly_download_baseurl: 'https://github.com/wildfly/wildfly/releases/download' diff --git a/roles/wildfly_install/meta/argument_specs.yml b/roles/wildfly_install/meta/argument_specs.yml index ad5a5003..611a1ff6 100644 --- a/roles/wildfly_install/meta/argument_specs.yml +++ b/roles/wildfly_install/meta/argument_specs.yml @@ -2,12 +2,12 @@ argument_specs: main: options: wildfly_version: - default: "35.0.0.Final" - description: "Wildfly version to install" + default: "37.0.0.Final" + description: "WildFly version to install" type: "str" wildfly_archive_filename: default: "wildfly-{{ wildfly_version }}.zip" - description: "Wildfly download archive name" + description: "WildFly download archive name" type: "str" wildfly_download_baseurl: default: "https://github.com/wildfly/wildfly/releases/download" @@ -19,11 +19,11 @@ argument_specs: type: "str" wildfly_home: default: "{{ wildfly_install_workdir }}wildfly-{{ wildfly_version }}/" - description: "Wildfly installation directory" + description: "WildFly installation directory" type: "str" wildfly_install_download_url: default: "{{ wildfly_download_baseurl }}/{{ wildfly_version }}/{{ wildfly_archive_filename }}" - description: "Wildfly download URL" + description: "WildFly download URL" type: "str" wildfly_archive_dir: default: "{{ wildfly_install_workdir }}" diff --git a/roles/wildfly_migration/README.md b/roles/wildfly_migration/README.md index 03604428..f5d25da2 100644 --- a/roles/wildfly_migration/README.md +++ b/roles/wildfly_migration/README.md @@ -1,7 +1,7 @@ wildfly migration role ====================== -This role encapsulate the [Wildfly Migration Tool](https://docs.wildfly.org/28/Migration_Guide.html) to allow using it as part of a Playbook. +This role encapsulate the [WildFly Migration Tool](https://docs.wildfly.org/28/Migration_Guide.html) to allow using it as part of a Playbook. Requirements ------------ diff --git a/roles/wildfly_subs/README.md b/roles/wildfly_subs/README.md index fa209cbe..a7ee54bb 100644 --- a/roles/wildfly_subs/README.md +++ b/roles/wildfly_subs/README.md @@ -1,7 +1,7 @@ wildfly subs role ==================== -This role is designed to help set up JBoss EAP (Red Hat product based on Wildfly) using RPM +This role is designed to help set up JBoss EAP (Red Hat product based on WildFly) using RPM delivered by Red Hat to its customer. The playbook provides handy reusable content to enable or disable a repo and install EAP using the group install feature. diff --git a/roles/wildfly_subs/meta/argument_specs.yml b/roles/wildfly_subs/meta/argument_specs.yml index 2c2a6156..ce801052 100644 --- a/roles/wildfly_subs/meta/argument_specs.yml +++ b/roles/wildfly_subs/meta/argument_specs.yml @@ -27,7 +27,7 @@ argument_specs: type: "str" wildfly_rpm_install_root_dir: default: "/opt/rh/eap7/" - description: "Wildfly or JBoss EAP install folder" + description: "WildFly or JBoss EAP install folder" type: "str" eap_group_install_name: default: "jboss-eap7-jdk11" diff --git a/roles/wildfly_systemd/README.md b/roles/wildfly_systemd/README.md index bfa4a2d9..23b9fe2c 100644 --- a/roles/wildfly_systemd/README.md +++ b/roles/wildfly_systemd/README.md @@ -1,7 +1,7 @@ wildfly systemd role ==================== -Role setting up a systemd service to manage a Wildfly app server instance, using basic information on server installation. +Role setting up a systemd service to manage a WildFly app server instance, using basic information on server installation. Note: default values are based on the one of the wildfly_install role. @@ -18,9 +18,9 @@ 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 | `35.0.0.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_version`| WildFly version to install | `37.0.0.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 | |`wildfly_config_custom_file`| Custom standalone.xml config to be copied to target instance and used as base | `''` | |`wildfly_port_range_offset`| Increment for `jboss.socket.binding.port-offset` | `100` | diff --git a/roles/wildfly_systemd/defaults/main.yml b/roles/wildfly_systemd/defaults/main.yml index 62fa2384..ef0f5e2e 100644 --- a/roles/wildfly_systemd/defaults/main.yml +++ b/roles/wildfly_systemd/defaults/main.yml @@ -1,7 +1,7 @@ --- wildfly_user: 'wildfly' wildfly_group: "{{ wildfly_user }}" -wildfly_version: '35.0.0.Final' +wildfly_version: '37.0.0.Final' wildfly_install_workdir: '/opt/wildfly/' wildfly_home: "{{ wildfly_install_workdir }}wildfly-{{ wildfly_version }}" wildfly_config_base: 'standalone.xml' diff --git a/roles/wildfly_systemd/handlers/main.yml b/roles/wildfly_systemd/handlers/main.yml index 3e0d4d89..0f621590 100644 --- a/roles/wildfly_systemd/handlers/main.yml +++ b/roles/wildfly_systemd/handlers/main.yml @@ -1,5 +1,5 @@ --- -- name: 'Restart Wildfly' +- name: 'Restart WildFly' ansible.builtin.include_tasks: service.yml vars: instance_state: restarted diff --git a/roles/wildfly_systemd/meta/argument_specs.yml b/roles/wildfly_systemd/meta/argument_specs.yml index 88dc9cf2..7257fef0 100644 --- a/roles/wildfly_systemd/meta/argument_specs.yml +++ b/roles/wildfly_systemd/meta/argument_specs.yml @@ -18,8 +18,8 @@ argument_specs: description: "posix group for wildfly service" type: "str" wildfly_version: - default: "35.0.0.Final" - description: "Wildfly version to install" + default: "37.0.0.Final" + description: "WildFly version to install" type: "str" wildfly_install_workdir: default: "/opt/wildfly/" @@ -27,7 +27,7 @@ argument_specs: type: "str" wildfly_home: default: "{{ wildfly_install_workdir }}wildfly-{{ wildfly_version }}" - description: "Wildfly installation directory" + description: "WildFly installation directory" type: "str" wildfly_config_base: default: "standalone.xml" diff --git a/roles/wildfly_uninstall/README.md b/roles/wildfly_uninstall/README.md index 5353f84d..873a9c49 100644 --- a/roles/wildfly_uninstall/README.md +++ b/roles/wildfly_uninstall/README.md @@ -1,7 +1,7 @@ wildfly uninstall role ====================== -Role to uninstall Wildfly and clean the target nodes. +Role to uninstall WildFly and clean the target nodes. Role Defaults @@ -38,8 +38,8 @@ Role Variables gather_facts: false vars: wildfly_uninstall_service_name: wildfly - wildfly_uninstall_home: /opt/wildfly/wildfly-35.0.0.Final - wildfly_uninstall_path_to_archive: /opt/wildfly/wildfly-35.0.0.Final.zip + wildfly_uninstall_home: /opt/wildfly/wildfly-37.0.0.Final + wildfly_uninstall_path_to_archive: /opt/wildfly/wildfly-37.0.0.Final.zip roles: - name: wildfly_uninstall ``` diff --git a/roles/wildfly_utils/README.md b/roles/wildfly_utils/README.md index 7352d0fe..6e5783f3 100644 --- a/roles/wildfly_utils/README.md +++ b/roles/wildfly_utils/README.md @@ -22,15 +22,14 @@ Role Defaults |`jboss_cli_controller_host`| Hostname for connecting to cli | `localhost` | |`jboss_cli_controller_port`| Port for connecting to cli | `9990` | |`wildfly_no_restart_after_patch`| When true, skip restarting after applying a cumulative patch | `False` | -|`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_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_prospero_version`| Version of Prospero to use | `1.3.0.Beta1` | |`wildfly_prospero_name`| Constant for the name of the prospero tool | `prospero` | |`wildfly_prospero_install_dir`| Path to the installation dir for Prospero | `/opt/prospero` | -|`wildfly_prospero_profile_name`| Name of the Wildfly profile for the server to install | `wildfly` | +|`wildfly_prospero_profile_name`| Name of the WildFly profile for the server to install | `wildfly` | |`wildfly_prospero_scenario_enable`| Specificy to Molecule if it should run the Prospero scenario | `True` | |`wildfly_prospero_archive_name`| Name of the Prospero archive | `{{ wildfly_prospero_name }}-{{ wildfly_prospero_version }}.zip` | -|`wildfly_prospero_home`| Home of the prospero tool | `{{ wildfly_prospero_install_dir }}/{{ wildfly_prospero_name }}-{{ wildfly_prospero_version }}` | |`wildfly_prospero_install_manifest_dir`| Path on target to the Prospero manifest | `{{ wildfly_install_workdir }}/manifest` | |`wildfly_prospero_download_url`| URL to download Prospero | `https://github.com/wildfly-extras/prospero/releases/download/{{ wildfly_prospero_version }}/prospero-{{ wildfly_prospero_version }}.zip` | |`wildfly_prospero_download_check_ssl`| Should Ansible check SSL when downloading Prospero | `False` | diff --git a/roles/wildfly_utils/defaults/main.yml b/roles/wildfly_utils/defaults/main.yml index e003e6f1..6b27bd76 100644 --- a/roles/wildfly_utils/defaults/main.yml +++ b/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: '35.0.0.Final' +wildfly_version: '37.0.0.Final' wildfly_install_workdir: '/opt/wildfly/' wildfly_home: "{{ wildfly_install_workdir }}wildfly-{{ wildfly_version }}/" wildfly_selinux_enabled: False @@ -13,14 +13,11 @@ jboss_home: "{{ wildfly_home }}" wildfly_utils_jboss_cli_require_privilege_escalation: true wildfly_port_range_offset: 0 -wildfly_prospero_version: 1.3.1.Final wildfly_prospero_name: prospero wildfly_prospero_install_dir: /opt/prospero wildfly_prospero_profile_name: wildfly wildfly_prospero_scenario_enable: true -wildfly_prospero_archive_name: "{{ wildfly_prospero_name }}-{{ wildfly_prospero_version }}.zip" -wildfly_prospero_home: "{{ wildfly_prospero_install_dir }}/{{ wildfly_prospero_name }}-{{ wildfly_prospero_version }}" -wildfly_prospero_download_url: "https://github.com/wildfly-extras/prospero/releases/download/{{ wildfly_prospero_version }}/prospero-build-{{ wildfly_prospero_version }}.zip" +wildfly_propsero_release_url: "https://api.github.com/repos/wildfly-extras/prospero/releases/latest" wildfly_prospero_download_check_ssl: False wildfly_apps_jboss_cli_deploy_force: "--force" diff --git a/roles/wildfly_utils/meta/argument_specs.yml b/roles/wildfly_utils/meta/argument_specs.yml index 0e752ca9..16f6c01e 100644 --- a/roles/wildfly_utils/meta/argument_specs.yml +++ b/roles/wildfly_utils/meta/argument_specs.yml @@ -26,8 +26,8 @@ argument_specs: description: "posix group for wildfly" type: "str" wildfly_version: - default: "35.0.0.Final" - description: "Wildfly version to install" + default: "37.0.0.Final" + description: "WildFly version to install" type: "str" wildfly_install_workdir: default: "/opt/wildfly/" @@ -35,11 +35,11 @@ argument_specs: type: "str" wildfly_home: default: "{{ wildfly_install_workdir }}wildfly-{{ wildfly_version }}/" - description: "Wildfly installation directory" + description: "WildFly installation directory" type: "str" jboss_home: default: "{{ wildfly_home }}" - description: "Wildfly installation directory, for backwards compatibility" + description: "WildFly installation directory, for backwards compatibility" type: "str" wildfly_no_restart_after_patch: default: False @@ -113,7 +113,7 @@ argument_specs: type: "str" eap_prospero_profile_name: default: "eap-8.0" - description: "Name of the Wildfly profile for the server to install" + description: "Name of the WildFly profile for the server to install" type: "str" jboss_cli: options: @@ -179,7 +179,7 @@ argument_specs: type: "str" wildfly_prospero_profile_name: default: "wildfly" - description: "Name of the Wildfly profile for the server to install" + description: "Name of the WildFly profile for the server to install" type: "str" wildfly_prospero_scenario_enable: default: true @@ -189,10 +189,6 @@ argument_specs: default: "{{ wildfly_prospero_name }}-{{ wildfly_prospero_version }}.zip" description: "Name of the Prospero archive" type: "str" - wildfly_prospero_home: - default: "{{ wildfly_prospero_install_dir }}/{{ wildfly_prospero_name }}-{{ wildfly_prospero_version }}" - description: "Home of the prospero tool" - type: "str" wildfly_prospero_install_manifest_dir: default: "{{ wildfly_install_workdir }}/manifest" description: "Path on target to the Prospero manifest" diff --git a/roles/wildfly_utils/tasks/prospero/install.yml b/roles/wildfly_utils/tasks/prospero/install.yml index 11f04d68..a0e82e00 100644 --- a/roles/wildfly_utils/tasks/prospero/install.yml +++ b/roles/wildfly_utils/tasks/prospero/install.yml @@ -5,10 +5,26 @@ register: local_path delegate_to: localhost +- name: Fetch latest Prospero release information from GitHub API + ansible.builtin.uri: + url: "{{ wildfly_propsero_release_url }}" + method: GET + return_content: true + register: prospero_release_info + delegate_to: localhost + run_once: true + +- name: Set fact for the latest Prospero version and download URL + ansible.builtin.set_fact: + wildfly_prospero_version: "{{ prospero_release_info.json.tag_name }}" + wildfly_prospero_download_url: "{{ (prospero_release_info.json.assets | selectattr('name', 'match', 'prospero-build-.*\\.zip') | first).browser_download_url }}" + delegate_to: localhost + run_once: true + - name: Set download paths ansible.builtin.set_fact: - full_path_to_prospero_archive: "{{ wildfly_prospero_install_dir }}/{{ wildfly_prospero_archive_name }}" - local_path_to_archive: "{{ local_path.stat.path }}/{{ wildfly_prospero_archive_name }}" + full_path_to_prospero_archive: "{{ wildfly_prospero_install_dir }}/{{ wildfly_prospero_name }}-{{ wildfly_prospero_version }}.zip" + local_path_to_archive: "{{ local_path.stat.path }}/{{ wildfly_prospero_name }}-{{ wildfly_prospero_version }}.zip" - name: "Check target archive: {{ full_path_to_prospero_archive }}" ansible.builtin.stat: diff --git a/roles/wildfly_utils/tasks/prospero/main.yml b/roles/wildfly_utils/tasks/prospero/main.yml index 1d58195e..31ec40bd 100644 --- a/roles/wildfly_utils/tasks/prospero/main.yml +++ b/roles/wildfly_utils/tasks/prospero/main.yml @@ -3,7 +3,6 @@ ansible.builtin.assert: that: - wildfly_home is defined - - wildfly_prospero_home is defined - wildfly_prospero_profile_name is defined - wildfly_prospero_install_dir is defined quiet: True @@ -64,6 +63,7 @@ ansible.builtin.include_tasks: prospero/run_cli.yml vars: wildfly_prospero_run_args: "install --dir {{ wildfly_home }} --profile {{ wildfly_prospero_profile_name }} --accept-license-agreements {{ prospero_command_args }}" + wildfly_prospero_version: "{{ prospero_release_info.json.tag_name }}" when: - not path_to_workdir.stat.exists diff --git a/roles/wildfly_utils/tasks/prospero/run_cli.yml b/roles/wildfly_utils/tasks/prospero/run_cli.yml index e889d8ea..fb068059 100644 --- a/roles/wildfly_utils/tasks/prospero/run_cli.yml +++ b/roles/wildfly_utils/tasks/prospero/run_cli.yml @@ -2,12 +2,11 @@ - name: "Ensure all required parameters are provided." ansible.builtin.assert: that: - - wildfly_prospero_home is defined and wildfly_prospero_home | length > 0 - wildfly_prospero_run_args is defined and wildfly_prospero_run_args | length > 0 - name: "Run tool to install server in {{ wildfly_home }}." ansible.builtin.command: > - {{ wildfly_prospero_home }}/bin/{{ wildfly_prospero_name }}.sh {{ wildfly_prospero_run_args }} + {{ wildfly_prospero_install_dir }}/{{ wildfly_prospero_name }}-{{ wildfly_prospero_version }}/bin/{{ wildfly_prospero_name }}.sh {{ wildfly_prospero_run_args }} register: prospero_run_results become: "{{ wildfly_install_requires_become | default(true) }}" changed_when: False # TODO: fix idempotency by parsing tool output diff --git a/roles/wildfly_validation/README.md b/roles/wildfly_validation/README.md index 09531b80..aa81e098 100644 --- a/roles/wildfly_validation/README.md +++ b/roles/wildfly_validation/README.md @@ -13,10 +13,10 @@ Role Defaults |`wildfly_user`| posix user account for wildfly | `wildfly` | |`wildfly_group`| posix group for wildfly | `{{ wildfly_user }}` | |`wildfly_service_name`| Systemd service name for wildfly | `wildfly` | -|`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_http_port`| Port to verify the Wildfly server is listening to requests | 8080 | -|`wildfly_controller_port`| Port to use to verify CLI connection to the Wildfly server | 9990 | +|`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_http_port`| Port to verify the WildFly server is listening to requests | 8080 | +|`wildfly_controller_port`| Port to use to verify CLI connection to the WildFly server | 9990 | Role Variables @@ -27,9 +27,9 @@ Role Variables ## Example playbook -### Wildfly service using an offset port +### WildFly service using an offset port -Validate a Wildfly service that was created using port offset of 100. +Validate a WildFly service that was created using port offset of 100. ``` --- diff --git a/roles/wildfly_validation/defaults/main.yml b/roles/wildfly_validation/defaults/main.yml index 6d055b1b..5b802507 100644 --- a/roles/wildfly_validation/defaults/main.yml +++ b/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: '35.0.0.Final' +wildfly_version: '37.0.0.Final' wildfly_install_workdir: '/opt/wildfly/' wildfly_home: "{{ wildfly_install_workdir }}wildfly-{{ wildfly_version }}/" wildfly_pidfile_homedir: '/run/wildfly' diff --git a/roles/wildfly_validation/meta/argument_specs.yml b/roles/wildfly_validation/meta/argument_specs.yml index 52ca40e1..6a2898c3 100644 --- a/roles/wildfly_validation/meta/argument_specs.yml +++ b/roles/wildfly_validation/meta/argument_specs.yml @@ -22,8 +22,8 @@ argument_specs: description: "Server HTTPS port" type: "str" wildfly_version: - default: "35.0.0.Final" - description: "Wildfly version to install" + default: "37.0.0.Final" + description: "WildFly version to install" type: "str" wildfly_install_workdir: default: "/opt/wildfly/" @@ -31,7 +31,7 @@ argument_specs: type: "str" wildfly_home: default: "{{ wildfly_install_workdir }}wildfly-{{ wildfly_version }}/" - description: "Wildfly installation directory" + description: "WildFly installation directory" type: "str" wildfly_standard_sockets_validation_query: default: "/socket-binding-group=standard-sockets/remote-destination-outbound-socket-binding=mail-smtp:read-attribute(name=host)" diff --git a/roles/wildfly_validation/tasks/verify_with_cli_queries.yml b/roles/wildfly_validation/tasks/verify_with_cli_queries.yml index 7adcb167..613d9119 100644 --- a/roles/wildfly_validation/tasks/verify_with_cli_queries.yml +++ b/roles/wildfly_validation/tasks/verify_with_cli_queries.yml @@ -4,7 +4,7 @@ that: - validation_query is defined - wildfly_home is defined - - wildfly_controller_port + - wildfly_controller_port is defined quiet: true fail_msg: "Missing required parameters"