From 8454f5c341785395baf6f7bb37b9e55ebde1ba1f Mon Sep 17 00:00:00 2001 From: Guido Grazioli Date: Tue, 31 May 2022 10:43:55 +0200 Subject: [PATCH] keycloak_quarkus: add selected java to PATH in systemd unit (#34) --- .ansible-lint | 1 + docs/testing.md | 1 - molecule/quarkus/prepare.yml | 4 ---- playbooks/{keyclock_quarkus.yml => keycloak_quarkus.yml} | 0 roles/keycloak_quarkus/templates/keycloak-sysconfig.j2 | 1 + 5 files changed, 2 insertions(+), 5 deletions(-) rename playbooks/{keyclock_quarkus.yml => keycloak_quarkus.yml} (100%) diff --git a/.ansible-lint b/.ansible-lint index 5472a97..ea3a6db 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -5,6 +5,7 @@ exclude_paths: - molecule/ - .ansible-lint - .yamllint + - meta/ rulesdir: - ../../ansible-lint-custom-rules/rules/ diff --git a/docs/testing.md b/docs/testing.md index 7a700c0..1d06d7f 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -46,4 +46,3 @@ EOF # run the playbook ansible-playbook -i inventory playbooks/keycloak.yml ``` - diff --git a/molecule/quarkus/prepare.yml b/molecule/quarkus/prepare.yml index 03433c0..bda79cf 100644 --- a/molecule/quarkus/prepare.yml +++ b/molecule/quarkus/prepare.yml @@ -2,10 +2,6 @@ - name: Prepare hosts: all tasks: - - name: Disable beta repos - ansible.builtin.command: yum config-manager --disable '*beta*' - ignore_errors: yes - - name: Install sudo ansible.builtin.yum: name: sudo diff --git a/playbooks/keyclock_quarkus.yml b/playbooks/keycloak_quarkus.yml similarity index 100% rename from playbooks/keyclock_quarkus.yml rename to playbooks/keycloak_quarkus.yml diff --git a/roles/keycloak_quarkus/templates/keycloak-sysconfig.j2 b/roles/keycloak_quarkus/templates/keycloak-sysconfig.j2 index 5315708..a3fdf57 100644 --- a/roles/keycloak_quarkus/templates/keycloak-sysconfig.j2 +++ b/roles/keycloak_quarkus/templates/keycloak-sysconfig.j2 @@ -1,4 +1,5 @@ # {{ ansible_managed }} KEYCLOAK_ADMIN={{ keycloak_quarkus_admin_user }} KEYCLOAK_ADMIN_PASSWORD='{{ keycloak_quarkus_admin_pass }}' +PATH={{ keycloak_java_home | default(keycloak_rpm_java_home, true) }}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin JAVA_HOME={{ keycloak_java_home | default(keycloak_rpm_java_home, true) }}