Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions .config/molecule/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,4 @@ provisioner:
interpreter_python: auto_silent
ssh_connection:
pipelining: false
inventory:
host_vars:
localhost:
ansible_python_interpreter: "{{ ansible_playbook_python }}"
# instance-rhel10:
# wildfly_java_version: 21
instance-rhel9:
wildfly_java_version: 17
instance-rhel8:
wildfly_java_version: 17
ansible_python_interpreter: /usr/bin/python3.9
inventory: {}
4 changes: 1 addition & 3 deletions molecule/app_deploy_standalone/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ provisioner:
inventory:
links:
group_vars: ../group_vars
group_vars:
all:
molecule_scenario_requires_app: true
host_vars: ../host_vars
env:
JUNIT_OUTPUT_DIR: "$PWD/junit"
JUNIT_HIDE_TASK_ARGUMENTS: yes
Expand Down
4 changes: 1 addition & 3 deletions molecule/colocated_cluster/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ provisioner:
inventory:
links:
group_vars: ../group_vars
group_vars:
all:
molecule_scenario_requires_app: true
host_vars: ../host_vars
env:
JUNIT_OUTPUT_DIR: "$PWD/junit"
JUNIT_HIDE_TASK_ARGUMENTS: yes
Expand Down
4 changes: 1 addition & 3 deletions molecule/custom_config_file/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ provisioner:
inventory:
links:
group_vars: ../group_vars
group_vars:
all:
molecule_scenario_requires_app: true
host_vars: ../host_vars
env:
JUNIT_OUTPUT_DIR: "$PWD/junit"
JUNIT_HIDE_TASK_ARGUMENTS: yes
Expand Down
4 changes: 1 addition & 3 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ provisioner:
inventory:
links:
group_vars: ../group_vars
group_vars:
all:
molecule_scenario_requires_app: true
host_vars: ../host_vars
env:
JUNIT_OUTPUT_DIR: "$PWD/junit"
JUNIT_HIDE_TASK_ARGUMENTS: yes
Expand Down
1 change: 1 addition & 0 deletions molecule/group_vars/all/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ wildfly_uninstall_require_privileges_escalation: "{{ wildfly_install_requires_be
wildfly_apps_requires_privilege_escalation: "{{ wildfly_install_requires_become | default(true) }}"
wildfly_utils_jboss_cli_require_privilege_escalation: "{{ wildfly_install_requires_become | default(true) }}"
wildfly_driver_become: "{{ wildfly_install_requires_become | default(true) }}"
molecule_scenario_requires_app: true
2 changes: 2 additions & 0 deletions molecule/host_vars/instance-rhel10/vars.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
wildfly_java_version: 21
3 changes: 3 additions & 0 deletions molecule/host_vars/instance-rhel8/vars.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
wildfly_java_version: 17
ansible_python_interpreter: /usr/bin/python3.9
2 changes: 2 additions & 0 deletions molecule/host_vars/instance-rhel9/vars.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
wildfly_java_version: 17
2 changes: 2 additions & 0 deletions molecule/host_vars/localhost/vars.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
ansible_python_interpreter: "{{ ansible_playbook_python }}"
4 changes: 1 addition & 3 deletions molecule/install_options/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ provisioner:
inventory:
links:
group_vars: ../group_vars
group_vars:
all:
molecule_scenario_requires_app: true
host_vars: ../host_vars
env:
JUNIT_OUTPUT_DIR: "$PWD/junit"
JUNIT_HIDE_TASK_ARGUMENTS: yes
Expand Down
2 changes: 1 addition & 1 deletion molecule/install_options/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
tasks:
- name: Verify we are running on requested jvm
ansible.builtin.shell: |
ps -ef | grep /etc/alternatives/jre_21/bin/java | grep -v grep
ps -ef | grep /etc/alternatives/jre_{{ wildfly_java_version }}/bin/java | grep -v grep
changed_when: False
1 change: 1 addition & 0 deletions molecule/offline_install_driver/group_vars/all/common.yml
3 changes: 3 additions & 0 deletions molecule/offline_install_driver/group_vars/all/scenario.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
molecule_scenario_requires_app: false
molecule_scenario_requires_driver: true
6 changes: 2 additions & 4 deletions molecule/offline_install_driver/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@ provisioner:
verify: verify.yml
inventory:
links:
group_vars: ../group_vars
group_vars:
all:
molecule_scenario_requires_driver: true
group_vars: group_vars
host_vars: ../host_vars
env:
JUNIT_OUTPUT_DIR: "$PWD/junit"
JUNIT_HIDE_TASK_ARGUMENTS: yes
Expand Down
22 changes: 6 additions & 16 deletions molecule/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,31 +58,21 @@
gpgkey: https://packages.adoptium.net/artifactory/api/gpg/key/public
become: "{{ wildfly_install_requires_become | default(true) }}"

- name: "Ensure required packages are installed (RHEL 10)"
- name: "Ensure required packages are installed (RHEL 9+)"
become: "{{ wildfly_install_requires_become | default(true) }}"
ansible.builtin.yum:
name:
- java-21-openjdk-headless
- "java-{{ wildfly_java_version }}-openjdk-headless"
- "temurin-{{ wildfly_java_version }}-jdk"
- procps-ng
- tzdata-java
state: present
when: ansible_distribution_major_version == '10'

- name: "Ensure required packages are installed (RHEL 9)"
become: "{{ wildfly_install_requires_become | default(true) }}"
ansible.builtin.yum:
name:
- java-17-openjdk-headless
- temurin-17-jdk
- procps-ng
- tzdata-java
state: present
when: ansible_distribution_major_version == '9'
when: ansible_distribution_major_version != '8'

- name: "Ensure required packages are installed (RHEL 8)"
become: "{{ wildfly_install_requires_become | default(true) }}"
ansible.builtin.command:
cmd: "dnf install -y java-17-openjdk-headless temurin-17-jdk procps-ng tzdata-java"
ansible.builtin.command:
cmd: "dnf install -y java-{{ wildfly_java_version }}-openjdk-headless temurin-{{ wildfly_java_version }}-jdk procps-ng tzdata-java"
changed_when: false
when: ansible_distribution_major_version == '8'

Expand Down
4 changes: 1 addition & 3 deletions molecule/prospero/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ provisioner:
inventory:
links:
group_vars: ../group_vars
group_vars:
all:
molecule_scenario_requires_app: true
host_vars: ../host_vars
env:
JUNIT_OUTPUT_DIR: "$PWD/junit"
JUNIT_HIDE_TASK_ARGUMENTS: yes
Expand Down
4 changes: 1 addition & 3 deletions molecule/temurinjdk_support/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ provisioner:
inventory:
links:
group_vars: ../group_vars
group_vars:
all:
molecule_scenario_requires_app: true
host_vars: ../host_vars
env:
JUNIT_OUTPUT_DIR: "$PWD/junit"
JUNIT_HIDE_TASK_ARGUMENTS: yes
Expand Down
4 changes: 1 addition & 3 deletions molecule/uninstall/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ provisioner:
inventory:
links:
group_vars: ../group_vars
group_vars:
all:
molecule_scenario_requires_app: true
host_vars: ../host_vars
env:
JUNIT_OUTPUT_DIR: "$PWD/junit"
JUNIT_HIDE_TASK_ARGUMENTS: yes
Expand Down
1 change: 1 addition & 0 deletions molecule/wildfly_migration/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ provisioner:
inventory:
links:
group_vars: ../group_vars
host_vars: ../host_vars
env:
JUNIT_OUTPUT_DIR: "$PWD/junit"
JUNIT_HIDE_TASK_ARGUMENTS: yes
Expand Down
4 changes: 1 addition & 3 deletions molecule/yaml_config_validation/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ provisioner:
inventory:
links:
group_vars: ../group_vars
group_vars:
all:
molecule_scenario_requires_app: true
host_vars: ../host_vars
env:
JUNIT_OUTPUT_DIR: "$PWD/junit"
JUNIT_HIDE_TASK_ARGUMENTS: yes
Expand Down
2 changes: 1 addition & 1 deletion roles/wildfly_systemd/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wildfly_config_base: 'standalone.xml'
wildfly_config_custom_file: ''
wildfly_port_range_offset: 0

wildfly_java_package_name: java-21-openjdk-headless
wildfly_java_package_name: "java-{{ wildfly_java_version | default(21) }}-openjdk-headless"
wildfly_java_opts: '-Xmx1024M -Xms512M'

wildfly_systemd_unit_enabled: true
Expand Down
Loading