Skip to content

Commit 1759ef1

Browse files
committed
Fix task names.
1 parent 1b4aff4 commit 1759ef1

File tree

5 files changed

+33
-33
lines changed

5 files changed

+33
-33
lines changed

roles/server/tasks/Debian.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: "Install Checkmk Server."
2+
- name: "{{ ansible_os_family }} Derivatives: Install Checkmk Server."
33
when: not 'check-mk-' + __checkmk_server_edition_mapping[checkmk_server_edition] + '-' +checkmk_server_version in ansible_facts.packages
44
become: true
55
ansible.builtin.package:

roles/server/tasks/RedHat.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
2-
- name: "Enable repositories on CentOS & RHEL 8."
2+
- name: "{{ ansible_os_family }} Derivatives: Enable repositories on CentOS & RHEL 8."
33
when: |
44
(ansible_facts.distribution == "RedHat" or ansible_facts.distribution == "CentOS" or ansible_facts.distribution == "OracleLinux")
55
and ansible_facts.distribution_major_version == "8"
66
block:
7-
- name: "Download EPEL GPG Key on CentOS & RHEL 8."
7+
- name: "{{ ansible_os_family }} Derivatives: Download EPEL GPG Key on CentOS & RHEL 8."
88
ansible.builtin.get_url:
99
url: "{{ __checkmk_server_epel_gpg_key }}"
1010
dest: "{{ __checkmk_server_tmp_dir }}/EPEL-pubkey.gpg"
@@ -14,7 +14,7 @@
1414
- download-gpg-key
1515
- enable-repos
1616

17-
- name: "Import Checkmk GPG Key on RHEL 8."
17+
- name: "{{ ansible_os_family }} Derivatives: Import Checkmk GPG Key on RHEL 8."
1818
become: true
1919
ansible.builtin.rpm_key:
2020
key: "{{ __checkmk_server_tmp_dir }}/EPEL-pubkey.gpg"
@@ -24,7 +24,7 @@
2424
- import-gpg-key
2525
- enable-repos
2626

27-
- name: "Install epel-release from URL on CentOS & RHEL 8."
27+
- name: "{{ ansible_os_family }} Derivatives: Install epel-release from URL on CentOS & RHEL 8."
2828
become: true
2929
ansible.builtin.package:
3030
name: "{{ __checkmk_server_epel_url }}"
@@ -33,7 +33,7 @@
3333
tags:
3434
- enable-repos
3535

36-
- name: "Enable CodeReady Linux Builder repo on RHEL 8."
36+
- name: "{{ ansible_os_family }} Derivatives: Enable CodeReady Linux Builder repo on RHEL 8."
3737
become: true
3838
community.general.rhsm_repository:
3939
name: "codeready-builder-for-rhel-{{ ansible_facts.distribution_major_version }}-x86_64-rpms"
@@ -44,7 +44,7 @@
4444
ansible_facts.distribution == "RedHat"
4545
and ansible_facts.distribution_major_version == "8"
4646
47-
- name: "Enable powertools repository on CentOS 8." # noqa no-changed-when
47+
- name: "{{ ansible_os_family }} Derivatives: Enable powertools repository on CentOS 8." # noqa no-changed-when
4848
become: true
4949
ansible.builtin.shell: dnf config-manager --set-enabled powertools # noqa command-instead-of-shell
5050
when: | # RHEL needs epel and a package URL
@@ -53,7 +53,7 @@
5353
tags:
5454
- enable-repos
5555

56-
- name: "Enable codeready builder repository on OracleLinux 8." # noqa no-changed-when
56+
- name: "{{ ansible_os_family }} Derivatives: Enable codeready builder repository on OracleLinux 8." # noqa no-changed-when
5757
become: true
5858
ansible.builtin.shell: dnf config-manager --set-enabled ol8_codeready_builder # noqa command-instead-of-shell
5959
when: | # RHEL needs epel and a package URL
@@ -62,7 +62,7 @@
6262
tags:
6363
- enable-repos
6464

65-
- name: "Enable powertools repository on RHEL 7."
65+
- name: "{{ ansible_os_family }} Derivatives: Enable powertools repository on RHEL 7."
6666
become: true
6767
community.general.rhsm_repository:
6868
name: "{{ item }}"
@@ -76,7 +76,7 @@
7676
tags:
7777
- enable-repos
7878

79-
- name: "Install Checkmk Server."
79+
- name: "{{ ansible_os_family }} Derivatives: Install Checkmk Server."
8080
when: not 'check-mk-' + __checkmk_server_edition_mapping[checkmk_server_edition] + '-' +checkmk_server_version in ansible_facts.packages
8181
become: true
8282
ansible.builtin.package:
@@ -87,7 +87,7 @@
8787
tags:
8888
- install-package
8989

90-
- name: "Enable httpd can network connect selinux boolean."
90+
- name: "{{ ansible_os_family }} Derivatives: Enable httpd can network connect selinux boolean."
9191
become: true
9292
ansible.posix.seboolean:
9393
name: httpd_can_network_connect

roles/server/tasks/configure-site.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: "Stop Site."
2+
- name: "{{ outer_item.name }}: Stop Site."
33
become: true
44
ansible.builtin.shell: |
55
set -o pipefail
@@ -11,7 +11,7 @@
1111
tags:
1212
- configure-sites
1313

14-
- name: "Configure Site '{{ outer_item.name }}'." # noqa no-changed-when
14+
- name: "{{ outer_item.name }}: Configure Site '{{ outer_item.name }}'." # noqa no-changed-when
1515
become: true
1616
ansible.builtin.shell: |
1717
set -o pipefail
@@ -23,7 +23,7 @@
2323
tags:
2424
- configure-sites
2525

26-
- name: "Start Site."
26+
- name: "{{ outer_item.name }}: Start Site."
2727
become: true
2828
ansible.builtin.shell: |
2929
set -o pipefail

roles/server/tasks/main.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
tags:
1616
- always
1717

18-
- name: "Include OS Family specific Variables."
18+
- name: "{{ ansible_system }}: Include OS Family specific Variables."
1919
ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
2020
tags:
2121
- include-os-family-vars
@@ -41,7 +41,7 @@
4141
- install-package
4242
- install-prerequisites
4343

44-
- name: "Install Checkmk Prerequisites."
44+
- name: "{{ ansible_system }}: Install Checkmk Prerequisites."
4545
become: true
4646
ansible.builtin.package:
4747
name: "{{ item }}"
@@ -52,11 +52,11 @@
5252
- install-package
5353
- install-prerequisites
5454

55-
- name: "Downloads Management."
55+
- name: "{{ ansible_system }}: Downloads Management."
5656
when: not 'check-mk-' + __checkmk_server_edition_mapping[checkmk_server_edition] + '-' +checkmk_server_version in ansible_facts.packages
5757
block:
5858

59-
- name: "Download Checkmk Server Setup."
59+
- name: "{{ ansible_system }}: Download Checkmk Server Setup."
6060
ansible.builtin.get_url:
6161
url: "{{ checkmk_server_download_url }}"
6262
dest: "{{ __checkmk_server_tmp_dir }}/{{ __checkmk_server_setup_file }}"
@@ -67,7 +67,7 @@
6767
tags:
6868
- download-package
6969

70-
- name: "Download Checkmk GPG Key."
70+
- name: "{{ ansible_system }}: Download Checkmk GPG Key."
7171
ansible.builtin.get_url:
7272
url: "{{ checkmk_server_gpg_download_url }}"
7373
dest: "{{ __checkmk_server_tmp_dir }}/Check_MK-pubkey.gpg"
@@ -79,7 +79,7 @@
7979
tags:
8080
- download-gpg-key
8181

82-
- name: "GPG Verification on Debian Derivatives."
82+
- name: "{{ ansible_system }}: GPG Verification on Debian Derivatives."
8383
when: checkmk_server_verify_setup | bool and ansible_os_family == "Debian"
8484
block:
8585
- name: "Import Checkmk GPG Key."
@@ -90,7 +90,7 @@
9090
tags:
9191
- import-gpg-key
9292

93-
- name: "Verify Checkmk Setup."
93+
- name: "{{ ansible_system }}: Verify Checkmk Setup."
9494
ansible.builtin.command: gpg --verify "{{ __checkmk_server_tmp_dir }}/{{ __checkmk_server_setup_file }}"
9595
register: __checkmk_server_verify_state
9696
changed_when: false
@@ -99,7 +99,7 @@
9999
- download-package
100100
- install-package
101101

102-
- name: "Import Checkmk GPG Key."
102+
- name: "{{ ansible_system }}: Import Checkmk GPG Key."
103103
become: true
104104
ansible.builtin.rpm_key:
105105
key: "{{ __checkmk_server_tmp_dir }}/Check_MK-pubkey.gpg"
@@ -108,18 +108,18 @@
108108
tags:
109109
- import-gpg-key
110110

111-
- name: Include OS Family specific Playbook.
111+
- name: "{{ ansible_system }}: Include OS Family specific Playbook."
112112
ansible.builtin.include_tasks: "{{ ansible_os_family }}.yml"
113113
tags:
114114
- always
115115

116-
- name: Include Site Management Playbook.
116+
- name: "{{ ansible_system }}: Include Site Management Playbook."
117117
ansible.builtin.include_tasks: "sites.yml"
118118
when: checkmk_server_sites is defined
119119
tags:
120120
- always
121121

122-
- name: "Cleanup unused Checkmk Versions."
122+
- name: "{{ ansible_system }}: Cleanup unused Checkmk Versions."
123123
become: true
124124
ansible.builtin.shell: |
125125
set -o pipefail
@@ -132,7 +132,7 @@
132132
tags:
133133
- cleanup
134134

135-
- name: "Cleanup Checkmk Server Setup."
135+
- name: "{{ ansible_system }}: Cleanup Checkmk Server Setup."
136136
ansible.builtin.file:
137137
path: "{{ __checkmk_server_tmp_dir }}/{{ __checkmk_server_setup_file }}"
138138
state: absent

roles/server/tasks/mkp.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: "Download MKP Packages."
2+
- name: "{{ __site.name }}: Download MKP Packages."
33
become: true
44
ansible.builtin.get_url:
55
url: "{{ __mkp.url }}"
@@ -18,7 +18,7 @@
1818
tags:
1919
- manage-mkp-packages
2020

21-
- name: "Transfer MKP Packages."
21+
- name: "{{ __site.name }}: Transfer MKP Packages."
2222
become: true
2323
ansible.builtin.copy:
2424
src: "{{ __mkp.src }}"
@@ -33,7 +33,7 @@
3333
tags:
3434
- manage-mkp-packages
3535

36-
- name: "Install MKP packages."
36+
- name: "{{ __site.name }}: Install MKP packages."
3737
become: true
3838
become_user: "{{ __site.name }}"
3939
ansible.builtin.command: "/bin/bash -l -c 'mkp add {{ __checkmk_server_tmp_dir }}/{{ __mkp.name }}-{{ __mkp.version }}.mkp'"
@@ -47,7 +47,7 @@
4747
tags:
4848
- manage-mkp-packages
4949

50-
- name: "Enable MKP packages."
50+
- name: "{{ __site.name }}: Enable MKP packages."
5151
become: true
5252
become_user: "{{ __site.name }}"
5353
ansible.builtin.command: "/bin/bash -l -c 'mkp enable {{ __mkp.name }} {{ __mkp.version }}'"
@@ -60,7 +60,7 @@
6060
tags:
6161
- manage-mkp-packages
6262

63-
- name: "Disable MKP packages."
63+
- name: "{{ __site.name }}: Disable MKP packages."
6464
become: true
6565
become_user: "{{ __site.name }}"
6666
ansible.builtin.command: "/bin/bash -l -c 'mkp disable {{ __mkp.name }} {{ __mkp.version }}'"
@@ -73,7 +73,7 @@
7373
tags:
7474
- manage-mkp-packages
7575

76-
- name: "Remove MKP packages."
76+
- name: "{{ __site.name }}: Remove MKP packages."
7777
become: true
7878
become_user: "{{ __site.name }}"
7979
ansible.builtin.command: "/bin/bash -l -c 'mkp remove {{ __mkp.name }} {{ __mkp.version }}'"
@@ -86,7 +86,7 @@
8686
tags:
8787
- manage-mkp-packages
8888

89-
- name: "Cleanup MKP Packages."
89+
- name: "{{ __site.name }}: Cleanup MKP Packages."
9090
become: true
9191
ansible.builtin.file:
9292
path: "{{ __checkmk_server_tmp_dir }}/{{ __mkp.name }}-{{ __mkp.version }}.mkp"

0 commit comments

Comments
 (0)