Skip to content

Commit 132131c

Browse files
committed
Simplify call setting of customer variable.
1 parent 97d51f3 commit 132131c

File tree

27 files changed

+54
-216
lines changed

27 files changed

+54
-216
lines changed

tests/integration/targets/activation/tasks/test.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
---
2-
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Set customer when needed."
2+
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Set customer attribute."
33
ansible.builtin.set_fact:
4-
checkmk_var_customer: "provider"
5-
when: outer_item.edition == "cme"
6-
7-
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Unset customer when needed."
8-
ansible.builtin.set_fact:
9-
checkmk_var_customer: null
10-
when: outer_item.edition != "cme"
4+
checkmk_var_customer: "{{ 'provider' if outer_item.edition == 'cme' else None }}"
115

126
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Activate without changes."
137
activation:

tests/integration/targets/aux_tag/tasks/test.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
---
2-
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Set customer when needed."
2+
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Set customer attribute."
33
ansible.builtin.set_fact:
4-
checkmk_var_customer: "provider"
5-
when: outer_item.edition == "cme"
6-
7-
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Unset customer when needed."
8-
ansible.builtin.set_fact:
9-
checkmk_var_customer: null
10-
when: outer_item.edition != "cme"
4+
checkmk_var_customer: "{{ 'provider' if outer_item.edition == 'cme' else None }}"
115

126
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Create auxiliary tag."
137
aux_tag:

tests/integration/targets/bakery/tasks/test.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
---
2-
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Set customer when needed."
2+
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Set customer attribute."
33
ansible.builtin.set_fact:
4-
checkmk_var_customer: "provider"
5-
when: outer_item.edition == "cme"
6-
7-
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Unset customer when needed."
8-
ansible.builtin.set_fact:
9-
checkmk_var_customer: null
10-
when: outer_item.edition != "cme"
4+
checkmk_var_customer: "{{ 'provider' if outer_item.edition == 'cme' else None }}"
115

126
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Create hosts."
137
host:

tests/integration/targets/contact_group/tasks/test.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
---
2-
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Set customer when needed."
2+
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Set customer attribute."
33
ansible.builtin.set_fact:
4-
checkmk_var_customer: "provider"
5-
when: outer_item.edition == "cme"
6-
7-
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Unset customer when needed."
8-
ansible.builtin.set_fact:
9-
checkmk_var_customer: null
10-
when: outer_item.edition != "cme"
4+
checkmk_var_customer: "{{ 'provider' if outer_item.edition == 'cme' else None }}"
115

126
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Create contact groups."
137
contact_group:

tests/integration/targets/dcd/tasks/test.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
---
2-
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Set customer when needed."
2+
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Set customer attribute."
33
ansible.builtin.set_fact:
4-
checkmk_var_customer: "provider"
5-
when: (outer_item.edition == "cme") or (outer_item.edition == "cce")
6-
7-
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Unset customer when needed."
8-
ansible.builtin.set_fact:
9-
checkmk_var_customer: null
10-
when: not ((outer_item.edition == "cme") or (outer_item.edition == "cce"))
4+
checkmk_var_customer: "{{ 'provider' if outer_item.edition == 'cme' else None }}"
115

126
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Create a DCD configuration."
137
dcd:

tests/integration/targets/discovery/tasks/test.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
---
2-
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Set customer when needed."
2+
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Set customer attribute."
33
ansible.builtin.set_fact:
4-
checkmk_var_customer: "provider"
5-
when: outer_item.edition == "cme"
6-
7-
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Unset customer when needed."
8-
ansible.builtin.set_fact:
9-
checkmk_var_customer: null
10-
when: outer_item.edition != "cme"
4+
checkmk_var_customer: "{{ 'provider' if outer_item.edition == 'cme' else None }}"
115

126
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Create hosts."
137
host:

tests/integration/targets/downtime/tasks/test.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
---
2-
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Set customer when needed."
2+
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Set customer attribute."
33
ansible.builtin.set_fact:
4-
checkmk_var_customer: "provider"
5-
when: outer_item.edition == "cme"
6-
7-
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Unset customer when needed."
8-
ansible.builtin.set_fact:
9-
checkmk_var_customer: null
10-
when: outer_item.edition != "cme"
4+
checkmk_var_customer: "{{ 'provider' if outer_item.edition == 'cme' else None }}"
115

126
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Create hosts."
137
host:

tests/integration/targets/folder/tasks/test.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,9 @@
22
# Take this from playbooks/test-full.yml to ensure full coverage!
33
# Be sure to remove header!
44

5-
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Set customer when needed."
5+
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Set customer attribute."
66
ansible.builtin.set_fact:
7-
checkmk_var_customer: "provider"
8-
when: outer_item.edition == "cme"
9-
10-
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Unset customer when needed."
11-
ansible.builtin.set_fact:
12-
checkmk_var_customer: null
13-
when: outer_item.edition != "cme"
7+
checkmk_var_customer: "{{ 'provider' if outer_item.edition == 'cme' else None }}"
148

159

1610
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Create folders."

tests/integration/targets/host/tasks/test.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
---
2-
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Set customer when needed."
2+
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Set customer attribute."
33
ansible.builtin.set_fact:
4-
checkmk_var_customer: "provider"
5-
when: outer_item.edition == "cme"
6-
7-
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Unset customer when needed."
8-
ansible.builtin.set_fact:
9-
checkmk_var_customer: null
10-
when: outer_item.edition != "cme"
4+
checkmk_var_customer: "{{ 'provider' if outer_item.edition == 'cme' else None }}"
115

126
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Create folders."
137
folder:

tests/integration/targets/host_group/tasks/test.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
---
2-
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Set customer when needed."
2+
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Set customer attribute."
33
ansible.builtin.set_fact:
4-
checkmk_var_customer: "provider"
5-
when: outer_item.edition == "cme"
6-
7-
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Unset customer when needed."
8-
ansible.builtin.set_fact:
9-
checkmk_var_customer: null
10-
when: outer_item.edition != "cme"
4+
checkmk_var_customer: "{{ 'provider' if outer_item.edition == 'cme' else None }}"
115

126
- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Create host groups."
137
host_group:

0 commit comments

Comments
 (0)