Skip to content

Commit 560fa44

Browse files
lcndsmrwidhalmt
andauthored
Feature/fqcn 178 (#224)
Uses FQCN for Ansible Modules. "Fixes" Issue #178 fixes #178 --------- Co-authored-by: Thomas Widhalm <thomas.widhalm@netways.de>
1 parent 971b69f commit 560fa44

File tree

51 files changed

+397
-383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+397
-383
lines changed

.config/ansible-lint.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@ skip_list:
1414
- 'command-instead-of-module'
1515
- 'role-name'
1616
- 'line-length'
17-
- 'fqcn-builtins'
1817
- 'package-latest'
1918
- yaml # Violations reported by yamllint.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,10 @@ The execution order of the roles is important! (see below)
179179
# elasticstack_release: 8 #7
180180
pre_tasks:
181181
- name: Install Rsyslog
182-
package:
182+
ansible.builtin.package:
183183
name: rsyslog
184184
- name: Start rsyslog
185-
service:
185+
ansible.builtin.service:
186186
name: rsyslog
187187
state: started
188188
enabled: true

molecule/beats_default/converge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
elasticstack_release: "{{ lookup('env', 'ELASTIC_RELEASE') | int}}"
1515
tasks:
1616
- name: Include Elastics repos role
17-
include_role:
17+
ansible.builtin.include_role:
1818
name: repos
1919
- name: Include Beats
20-
include_role:
20+
ansible.builtin.include_role:
2121
name: beats

molecule/beats_default/prepare.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
hosts: all
44
tasks:
55
- name: Install packages for Debian
6-
apt:
6+
ansible.builtin.apt:
77
name:
88
- gpg
99
- gpg-agent

molecule/beats_default/verify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
hosts: all
66
tasks:
77
- name: Example assertion
8-
assert:
8+
ansible.builtin.assert:
99
that: true

molecule/beats_peculiar/converge.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,27 @@
3737
tasks:
3838

3939
- name: Set Filebeat version for 7.x
40-
set_fact:
40+
ansible.builtin.set_fact:
4141
elasticstack_version: "7.17.1"
4242
when:
4343
- elasticstack_release == 7
4444

4545
- name: Set Filebeat version for 8.x
46-
set_fact:
46+
ansible.builtin.set_fact:
4747
elasticstack_version: "8.4.1"
4848
when:
4949
- elasticstack_release == 8
5050

5151
- name: "Include Elastics repos role"
52-
include_role:
52+
ansible.builtin.include_role:
5353
name: repos
5454

5555
- name: Refresh apt cache
56-
apt:
56+
ansible.builtin.apt:
5757
update_cache: yes
5858
changed_when: false
5959
when: ansible_os_family == "Debian"
6060

6161
- name: "Include Beats"
62-
include_role:
62+
ansible.builtin.include_role:
6363
name: beats

molecule/beats_peculiar/prepare.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
hosts: all
44
tasks:
55
- name: Install packages for Debian
6-
apt:
6+
ansible.builtin.apt:
77
name:
88
- gpg
99
- gpg-agent

molecule/beats_peculiar/verify.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66
elasticstack_release: "{{ lookup('env', 'ELASTIC_RELEASE') | int}}"
77
tasks:
88
- name: fetch Filebeat version
9-
command: "filebeat version | grep ^filebeat"
9+
ansible.builtin.command: "filebeat version | grep ^filebeat"
1010
register: beats_filebeat_version
1111

1212
- name: DEBUG show filebeat version output
13-
debug:
13+
ansible.builtin.debug:
1414
var: beats_filebeat_version.stdout
1515

1616
- name: Fail if Filebeat has the wrong version
17-
fail:
17+
ansible.builtin.fail:
1818
msg: "Filebeat has the wrong version"
1919
when:
2020
- beats_filebeat_version.stdout.find('7.17.1') == -1
2121
- elasticstack_release == 7
2222

2323
- name: Fail if Filebeat has the wrong version
24-
fail:
24+
ansible.builtin.fail:
2525
msg: "Filebeat has the wrong version"
2626
when:
2727
- beats_filebeat_version.stdout.find('8.4.1') == -1

molecule/elasticsearch_cluster-oss/converge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
elasticsearch_heap: "1"
1414
tasks:
1515
- name: Include Elastics repos role
16-
include_role:
16+
ansible.builtin.include_role:
1717
name: repos
1818
- name: Include Elasticsearch
19-
include_role:
19+
ansible.builtin.include_role:
2020
name: elasticsearch

molecule/elasticsearch_cluster-oss/prepare.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
hosts: all
44
tasks:
55
- name: Install packages for Debian
6-
apt:
6+
ansible.builtin.apt:
77
name:
88
- gpg
99
- gpg-agent

0 commit comments

Comments
 (0)