From c38308e98546b0230a01950d7a7603c74cf0d103 Mon Sep 17 00:00:00 2001 From: Guido Grazioli Date: Thu, 16 Dec 2021 13:32:36 +0100 Subject: [PATCH] Infer correct systemd service name, add admin pass assert --- roles/infinispan/defaults/main.yml | 9 +++++---- roles/infinispan/tasks/main.yml | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/roles/infinispan/defaults/main.yml b/roles/infinispan/defaults/main.yml index 092c48f..9247a52 100644 --- a/roles/infinispan/defaults/main.yml +++ b/roles/infinispan/defaults/main.yml @@ -16,7 +16,8 @@ jdg_app_download_dir: "/opt/apps" jdg_enable: "{{ True if jdg_rhn_id is defined else False }}" jdg_healthcheck: True jdg: - home: "{{jdg_default_installation_path if jdg_rhn_id is defined else infinispan_installation_path }}" + home: "{{ jdg_default_installation_path if jdg_rhn_id is defined else infinispan_installation_path }}" + version: "{{ jdg_version if jdg_rhn_id is defined else infinispan_version }}" bind_addr: "{{ override_jdg_bind_addr | default('localhost') }}" port: "{{ override_jdg_port | default('11222') }}" jgroups_port: "{{ override_jdg_jgroups_port | default('7800') }}" @@ -30,12 +31,12 @@ jdg: group: name: "{{ override_jdg_group | default('jdg') }}" service: - name: "{{ override_jdg_service_name | default('jdg') }}" - users: "{{ [ jdg_supervisor ] + infinispan_users|default([]) }}" + name: "{{ override_jdg_service_name | default('jdg' if jdg_rhn_id is defined else 'infinispan') }}" + users: "{{ [ jdg_supervisor ] + infinispan_users }}" jdg_supervisor: name: 'supervisor' - password: "{{ supervisor_password|default('itsme') }}" + password: "{{ supervisor_password }}" roles: 'supervisor' jdg_default_realm_tls: False diff --git a/roles/infinispan/tasks/main.yml b/roles/infinispan/tasks/main.yml index 957e499..a8af779 100644 --- a/roles/infinispan/tasks/main.yml +++ b/roles/infinispan/tasks/main.yml @@ -7,7 +7,8 @@ - jdg.user.name is defined - jdg.group is defined - jdg.group.name is defined - - jdg_version is defined + - jdg.version is defined + - supervisor_password is defined and supervisor_password|length > 0 quiet: true - include_tasks: prereqs.yml