Skip to content

Commit c73d7c6

Browse files
author
ktechmidas
committed
final fix
1 parent e2a37a7 commit c73d7c6

File tree

1 file changed

+22
-7
lines changed

1 file changed

+22
-7
lines changed

ansible/roles/dashmate/tasks/main.yml

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,12 @@
3333
- name: Extract installed version number
3434
ansible.builtin.set_fact:
3535
installed_dashmate_version: >-
36-
{{
37-
current_dashmate_version.stdout |
38-
regex_search('dashmate/([0-9]+\\.[0-9]+\\.[0-9]+(-[a-zA-Z0-9.-]+)?)', '\\1') |
39-
first if current_dashmate_version.stdout is defined else 'none'
40-
}}
36+
{%- if current_dashmate_version is defined and current_dashmate_version.stdout is defined -%}
37+
{%- set version_match = current_dashmate_version.stdout | regex_search('dashmate/([0-9]+\\.[0-9]+\\.[0-9]+(-[a-zA-Z0-9.-]+)?)', '\\1') -%}
38+
{{ version_match | first if version_match else 'none' }}
39+
{%- else -%}
40+
none
41+
{%- endif -%}
4142
4243
- name: Compare versions
4344
ansible.builtin.set_fact:
@@ -67,8 +68,22 @@
6768

6869
- name: Set user/group existence facts
6970
ansible.builtin.set_fact:
70-
dashmate_group_exists: "{{ (dashmate_group_check is defined and dashmate_group_check.rc is defined and dashmate_group_check.rc == 0) | default(true if skip_dashmate_image_update | default(false) else false) }}"
71-
dashmate_user_exists: "{{ (dashmate_user_check is defined and dashmate_user_check.rc is defined and dashmate_user_check.rc == 0) | default(true if skip_dashmate_image_update | default(false) else false) }}"
71+
dashmate_group_exists: >-
72+
{%- if skip_dashmate_image_update | default(false) -%}
73+
true
74+
{%- elif dashmate_group_check is defined and dashmate_group_check.rc is defined -%}
75+
{{ dashmate_group_check.rc == 0 }}
76+
{%- else -%}
77+
false
78+
{%- endif -%}
79+
dashmate_user_exists: >-
80+
{%- if skip_dashmate_image_update | default(false) -%}
81+
true
82+
{%- elif dashmate_user_check is defined and dashmate_user_check.rc is defined -%}
83+
{{ dashmate_user_check.rc == 0 }}
84+
{%- else -%}
85+
false
86+
{%- endif -%}
7287
7388
- name: Debug user/group check results
7489
ansible.builtin.debug:

0 commit comments

Comments
 (0)