Skip to content

Commit

Permalink
AMW-245 Fix wildfly-cluster-demo on Olympus
Browse files Browse the repository at this point in the history
  • Loading branch information
rpelisse committed Apr 23, 2024
1 parent d1facc0 commit 8e22a47
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python_version: ["3.10"]
python_version: ["3.11"]
steps:
- name: Check out code
uses: actions/checkout@v2
Expand All @@ -27,7 +27,7 @@ jobs:
- name: Install yamllint, ansible and molecule
run: |
python -m pip install --upgrade pip
pip install yamllint 'molecule[docker]~=3.5.2' ansible-core flake8 ansible-lint voluptuous
pip install yamllint 'molecule>=6.0.3' 'molecule-plugins[docker]>=23.5.3' ansible-core flake8 ansible-lint voluptuous
- name: Run molecule test
run: |
Expand Down
9 changes: 6 additions & 3 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,20 @@ driver:
platforms:
- name: instance
image: registry.access.redhat.com/ubi9/ubi-init:latest
pre_build_image: true
privileged: true
tmpfs:
- /run
- /tmp
command: "/usr/sbin/init"
port_bindings:
- 8080:8080
published_ports:
- 0.0.0.0:8080:8080/TCP
provisioner:
name: ansible
config_options:
defaults:
interpreter_python: auto_silent
ssh_connection:
pipelining: false
playbooks:
converge: ../../playbook.yml
vars:
Expand Down
7 changes: 4 additions & 3 deletions playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@
vars:
wildfly_config_base: 'standalone-ha.xml'
wildfly_basedir_prefix: "/opt/{{ install_name }}-{{ item }}"
wildfly_config_name: "{{ install_name }}"
wildfly_instance_name: "{{ install_name }}"
wildfly_config_name: "{{ install_name }}-{{ item }}"
wildfly_instance_name: "{{ install_name }}-{{ item }}"
wildfly_instance_id: "{{ item }}"
service_systemd_env_file: "/etc/{{ install_name }}-{{ item }}.conf"
service_systemd_conf_file: "/usr/lib/systemd/system/{{ install_name }}-{{ item }}.service"
wildfly_port_range_offset: "{{ 100 * (item) | int }}"
loop: "{{ range(0,3) | list }}"

- name: "Ensures webapp {{ app.name }} has been retrieved from {{ app.url }}"
Expand All @@ -41,7 +42,7 @@
url: "{{ app.url }}"
dest: "{{ wildfly_install_workdir }}/{{ app.name }}"

- name: "Determin info app absolute path."
- name: "Determine info app absolute path."
ansible.builtin.set_fact:
info_app_dest: "{{ wildfly_install_workdir }}/{{ app.name }}"

Expand Down

0 comments on commit 8e22a47

Please sign in to comment.