Skip to content

Commit ff7c3b8

Browse files
committed
fix: correct file existence check
Signed-off-by: Gerard Vanloo <gerard.vanloo@ibm.com>
1 parent 442cd1b commit ff7c3b8

File tree

6 files changed

+37
-6
lines changed

6 files changed

+37
-6
lines changed

sre/playbooks/manage_applications.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
ansible.builtin.import_role:
5151
name: leaderboard
5252
vars:
53+
leaderboard_incident:
54+
id: "{{ incident_id }}"
5355
leaderboard_status:
5456
status: progressing
5557

@@ -66,13 +68,17 @@
6668
ansible.builtin.import_role:
6769
name: leaderboard
6870
vars:
71+
leaderboard_incident:
72+
id: "{{ incident_id }}"
6973
leaderboard_status:
7074
status: succeeded
7175
rescue:
7276
- name: Import leaderboard role
7377
ansible.builtin.import_role:
7478
name: leaderboard
7579
vars:
80+
leaderboard_incident:
81+
id: "{{ incident_id }}"
7682
leaderboard_status:
7783
failed_task:
7884
name: "{{ ansible_failed_task.name }}"

sre/playbooks/manage_incidents.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
ansible.builtin.import_role:
4848
name: leaderboard
4949
vars:
50+
leaderboard_incident:
51+
id: "{{ incident_id }}"
5052
leaderboard_status:
5153
status: progressing
5254

@@ -98,13 +100,17 @@
98100
ansible.builtin.import_role:
99101
name: leaderboard
100102
vars:
103+
leaderboard_incident:
104+
id: "{{ incident_id }}"
101105
leaderboard_status:
102106
status: succeeded
103107
rescue:
104108
- name: Import leaderboard role
105109
ansible.builtin.import_role:
106110
name: leaderboard
107111
vars:
112+
leaderboard_incident:
113+
id: "{{ incident_id }}"
108114
leaderboard_status:
109115
failed_task:
110116
name: "{{ ansible_failed_task.name }}"

sre/playbooks/manage_tools.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@
5959
ansible.builtin.import_role:
6060
name: leaderboard
6161
vars:
62+
leaderboard_incident:
63+
id: "{{ incident_id }}"
6264
leaderboard_status:
6365
status: progressing
6466

@@ -75,13 +77,17 @@
7577
ansible.builtin.import_role:
7678
name: leaderboard
7779
vars:
80+
leaderboard_incident:
81+
id: "{{ incident_id }}"
7882
leaderboard_status:
7983
status: succeeded
8084
rescue:
8185
- name: Import leaderboard role
8286
ansible.builtin.import_role:
8387
name: leaderboard
8488
vars:
89+
leaderboard_incident:
90+
id: "{{ incident_id }}"
8591
leaderboard_status:
8692
failed_task:
8793
name: "{{ ansible_failed_task.name }}"

sre/roles/leaderboard/meta/argument_specs.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ argument_specs:
88
author:
99
- Gerard Vanloo
1010
options:
11+
leaderboard_incident:
12+
required: false
13+
type: dict
14+
options:
15+
id:
16+
required: true
17+
type: int
1118
leaderboard_status:
1219
required: true
1320
type: dict
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
---
22
- name: Create leaderboard status content
33
ansible.builtin.set_fact:
4-
leaderboard_status:
5-
incident: "{{ leaderboard_incident.id | default('') }}"
4+
leaderboard_current_status:
5+
incident: "{{ leaderboard_incident.id | default(omit) }}"
66
events: []
7-
leaderboard_status_legacy:
7+
leaderboard_legacy_status:
88
status:
99
conditions: []
1010

1111
- name: Create status file in legacy format
1212
ansible.builtin.copy:
13-
content: "{{ leaderboard_status_legacy | to_nice_json(indent=2) }}"
13+
content: "{{ leaderboard_legacy_status | to_nice_json(indent=2) }}"
1414
dest: "/tmp/status_legacy.json"
1515
mode: "0644"
1616

1717
- name: Create status file in v1 format
1818
ansible.builtin.copy:
19-
content: "{{ leaderboard_status_legacy | to_nice_json }}"
19+
content: "{{ leaderboard_current_status | to_nice_json }}"
2020
dest: "/tmp/status.json"
2121
mode: "0644"

sre/roles/leaderboard/tasks/main.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,15 @@
55
tags:
66
- install_tools
77

8+
- name: Verify that the status file exists
9+
ansible.builtin.set_fact:
10+
leaderboard_status_exists: "{{ '/tmp/status.json' is exists }}"
11+
tags:
12+
- always
13+
814
- name: Perform update tasks
915
when:
10-
- /tmp/status.json is exists
16+
- leaderboard_status_exists
1117
block:
1218
- name: Import status file update tasks
1319
ansible.builtin.import_tasks:

0 commit comments

Comments
 (0)