Skip to content
This repository was archived by the owner on May 31, 2023. It is now read-only.

Commit f3e999c

Browse files
krzyzakppaulfantom
authored andcommitted
Replaced tag always, which colidate when including role. (#109)
1 parent efa8062 commit f3e999c

File tree

3 files changed

+32
-15
lines changed

3 files changed

+32
-15
lines changed

tasks/main.yml

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,57 +8,73 @@
88
- "{{ ansible_distribution | lower }}.yml"
99
- "{{ ansible_os_family | lower }}.yml"
1010
tags:
11-
- always
11+
- grafana_install
12+
- grafana_configure
13+
- grafana_datasources
14+
- grafana_notifications
15+
- grafana_dashboards
1216

1317
- include: preflight.yml
1418
tags:
15-
- always
19+
- grafana_install
20+
- grafana_configure
21+
- grafana_datasources
22+
- grafana_notifications
23+
- grafana_dashboards
1624

1725
- include: install.yml
1826
become: true
1927
tags:
20-
- install
28+
- grafana_install
2129

2230
- include: configure.yml
2331
become: true
2432
tags:
25-
- configure
33+
- grafana_configure
2634

2735
- include: plugins.yml
2836
when: grafana_plugins != []
2937
tags:
30-
- configure
38+
- grafana_configure
3139

3240
- name: Restart grafana before configuring datasources and dashboards
3341
meta: flush_handlers
3442
tags:
35-
- always
43+
- grafana_install
44+
- grafana_configure
45+
- grafana_datasources
46+
- grafana_notifications
47+
- grafana_dashboards
3648

3749
- name: Wait for grafana to start
3850
wait_for:
3951
host: "{{ grafana_address }}"
4052
port: "{{ grafana_port }}"
4153
tags:
42-
- always
54+
- grafana_install
55+
- grafana_configure
56+
- grafana_datasources
57+
- grafana_notifications
58+
- grafana_dashboards
4359

4460
- include: api_keys.yml
4561
when: grafana_api_keys | length > 0
4662
tags:
47-
- configure
63+
- grafana_configure
4864

4965
- include: datasources.yml
5066
when: grafana_datasources != []
5167
tags:
52-
- configure
53-
- datasources
68+
- grafana_configure
69+
- grafana_datasources
5470

5571
- include: notifications.yml
5672
when: grafana_alert_notifications | length > 0
5773
tags:
58-
- configure
59-
- notifications
74+
- grafana_configure
75+
- grafana_notifications
6076

6177
- include: dashboards.yml
6278
tags:
63-
- configure
64-
- dashboards
79+
- grafana_configure
80+
- grafana_dashboards

test-requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ docker
33
ansible-lint>=3.4.0
44
testinfra>=1.7.0
55
jmespath
6+
pytest==3.9.3

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ deps =
1717
ansible26: ansible<2.7
1818
ansible27: ansible<2.8
1919
commands =
20-
{posargs:molecule test --all --destroy always}
20+
{posargs:molecule test --all --destroy=always}

0 commit comments

Comments
 (0)