Skip to content

Commit c38308e

Browse files
committed
Infer correct systemd service name, add admin pass assert
1 parent b4496a2 commit c38308e

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

roles/infinispan/defaults/main.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ jdg_app_download_dir: "/opt/apps"
1616
jdg_enable: "{{ True if jdg_rhn_id is defined else False }}"
1717
jdg_healthcheck: True
1818
jdg:
19-
home: "{{jdg_default_installation_path if jdg_rhn_id is defined else infinispan_installation_path }}"
19+
home: "{{ jdg_default_installation_path if jdg_rhn_id is defined else infinispan_installation_path }}"
20+
version: "{{ jdg_version if jdg_rhn_id is defined else infinispan_version }}"
2021
bind_addr: "{{ override_jdg_bind_addr | default('localhost') }}"
2122
port: "{{ override_jdg_port | default('11222') }}"
2223
jgroups_port: "{{ override_jdg_jgroups_port | default('7800') }}"
@@ -30,12 +31,12 @@ jdg:
3031
group:
3132
name: "{{ override_jdg_group | default('jdg') }}"
3233
service:
33-
name: "{{ override_jdg_service_name | default('jdg') }}"
34-
users: "{{ [ jdg_supervisor ] + infinispan_users|default([]) }}"
34+
name: "{{ override_jdg_service_name | default('jdg' if jdg_rhn_id is defined else 'infinispan') }}"
35+
users: "{{ [ jdg_supervisor ] + infinispan_users }}"
3536

3637
jdg_supervisor:
3738
name: 'supervisor'
38-
password: "{{ supervisor_password|default('itsme') }}"
39+
password: "{{ supervisor_password }}"
3940
roles: 'supervisor'
4041

4142
jdg_default_realm_tls: False

roles/infinispan/tasks/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
- jdg.user.name is defined
88
- jdg.group is defined
99
- jdg.group.name is defined
10-
- jdg_version is defined
10+
- jdg.version is defined
11+
- supervisor_password is defined and supervisor_password|length > 0
1112
quiet: true
1213

1314
- include_tasks: prereqs.yml

0 commit comments

Comments
 (0)