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

Commit 4e06240

Browse files
committed
Use the FQCN throughout the whole project
1 parent 6f9c9e2 commit 4e06240

6 files changed

Lines changed: 30 additions & 30 deletions

File tree

handlers/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
---
77
- name: Restart Redis Server
88
become: yes
9-
service:
9+
ansible.builtin.service:
1010
name: "{{ redis_server_service_name }}"
1111
state: restarted
1212
daemon_reload: yes
1313

1414
- name: Restart Redis Sentinel
1515
become: yes
16-
service:
16+
ansible.builtin.service:
1717
name: "{{ redis_sentinel_service_name }}"
1818
state: restarted
1919
daemon_reload: yes

molecule/default/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
hosts: all
99
tasks:
1010
- name: "Include redis_role"
11-
include_role:
11+
ansible.builtin.include_role:
1212
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
1313

1414
...

molecule/default/molecule.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ platforms:
1818
- /sys/fs/cgroup:/sys/fs/cgroup:ro
1919
lint: |
2020
yamllint --strict --format colored .
21-
ansible-lint -v --force-color --exclude .pipenv/ .
21+
ansible-lint -v --force-color --offline --exclude .pipenv/ .
2222
provisioner:
2323
name: ansible
2424
playbooks:

molecule/default/prepare.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
hosts: all
99
tasks:
1010
- name: Install dependencies
11-
apt:
11+
ansible.builtin.apt:
1212
name:
1313
- ca-certificates # for Redis download
1414
- iproute2 # for gathering network facts

molecule/default/verify.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@
1717
redis_password: 'changeme'
1818
tasks:
1919
- name: Populate service facts
20-
service_facts:
20+
ansible.builtin.service_facts:
2121
register: services_state
2222

2323
- name: Check that Redis is running on instance
24-
assert:
24+
ansible.builtin.assert:
2525
that:
2626
- services_state.ansible_facts.services[redis_server_service_name + '.service'].state is search("running")
2727
- services_state.ansible_facts.services[redis_sentinel_service_name + '.service'].state is search("running")
2828

2929
- name: Gather facts on listening ports.
30-
listen_ports_facts:
30+
community.general.listen_ports_facts:
3131

3232
- name: Check if Redis is listening on TCP ports
3333
vars:
3434
tcp_listen: "{{ ansible_facts.tcp_listen | selectattr('port', 'in', redis_ports) | list }}"
35-
assert:
35+
ansible.builtin.assert:
3636
that:
3737
- item.name == redis_server_service_name
3838
loop: "{{ tcp_listen }}"

tasks/main.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,51 +5,51 @@
55

66
---
77
- name: Check whether Redis server is installed.
8-
stat:
8+
ansible.builtin.stat:
99
path: "{{ redis_bin }}"
1010
register: redis_server_installed
1111

1212
- name: Check Redis version.
13-
command:
13+
ansible.builtin.command:
1414
cmd: "{{ redis_bin }} -v"
1515
register: redis_version_installed
1616
when: redis_server_installed.stat.exists
1717
changed_when: false
1818
check_mode: no
1919

2020
- name: Determine version.
21-
set_fact:
21+
ansible.builtin.set_fact:
2222
installed_redis_server_version: "{{ redis_version_installed.stdout | regex_search('^Redis server v=(\\d+\\.\\d+\\.\\d+)', '\\1') | first }}"
2323
when: redis_server_installed.stat.exists
2424

2525
- name: Output version strings.
26-
debug:
26+
ansible.builtin.debug:
2727
msg: "Installed version: {{ installed_redis_server_version }}, version to be installed: {{ redis_version }}."
2828
when: installed_redis_server_version is defined
2929

3030
- name: Check if version strings are equal.
31-
set_fact:
31+
ansible.builtin.set_fact:
3232
is_redis_server_version_equal: "{{ installed_redis_server_version is version(redis_version, operator='==', strict=True) }}"
3333
when: redis_server_installed.stat.exists
3434

3535
- name: Install dependencies.
3636
become: yes
37-
package:
37+
ansible.builtin.package:
3838
name: "{{ item }}"
3939
state: present
4040
update_cache: yes
4141
with_items: "{{ redis_dependencies }}"
4242

4343
- name: Create Redis Group.
4444
become: yes
45-
group:
45+
ansible.builtin.group:
4646
name: "{{ redis_group }}"
4747
system: yes
4848
state: present
4949

5050
- name: Add Redis System User.
5151
become: yes
52-
user:
52+
ansible.builtin.user:
5353
name: "{{ redis_user }}"
5454
group: "{{ redis_group }}"
5555
system: yes
@@ -60,7 +60,7 @@
6060
block:
6161
- name: Download and extract redis-{{ redis_version }}.tar.gz
6262
become: yes
63-
unarchive:
63+
ansible.builtin.unarchive:
6464
src: "{{ redis_download_url }}"
6565
dest: "{{ redis_build_dir | dirname }}"
6666
mode: 0755
@@ -70,27 +70,27 @@
7070

7171
- name: Build Redis.
7272
become: yes
73-
make:
73+
ansible.builtin.make:
7474
chdir: "{{ redis_build_dir }}"
7575

7676
- name: Install Redis.
7777
become: yes
78-
make:
78+
community.general.make:
7979
chdir: "{{ redis_build_dir }}"
8080
target: install
8181
notify:
8282
- Restart Redis Server
8383
- Restart Redis Sentinel
8484

8585
- name: Remove current Redis Build Directory.
86-
file:
86+
ansible.builtin.file:
8787
path: "{{ redis_build_dir }}"
8888
state: absent
8989
when: redis_version is defined
9090

9191
- name: Create Redis Server Service file.
9292
become: yes
93-
template:
93+
ansible.builtin.template:
9494
src: "redis-server.service.j2"
9595
dest: "{{ redis_server_service_file }}"
9696
mode: 0640
@@ -101,7 +101,7 @@
101101

102102
- name: Create Redis Sentinel Service file.
103103
become: yes
104-
template:
104+
ansible.builtin.template:
105105
src: "redis-sentinel.service.j2"
106106
dest: "{{ redis_sentinel_service_file }}"
107107
mode: 0640
@@ -112,7 +112,7 @@
112112

113113
- name: Create Redis Configuration Directory.
114114
become: yes
115-
file:
115+
ansible.builtin.file:
116116
path: "{{ redis_configuration_dir }}"
117117
state: directory
118118
mode: 0755
@@ -121,7 +121,7 @@
121121

122122
- name: Configure Redis.
123123
become: yes
124-
template:
124+
ansible.builtin.template:
125125
src: redis.conf.j2
126126
dest: "{{ redis_server_configuration_file }}"
127127
mode: 0640
@@ -131,7 +131,7 @@
131131

132132
- name: Configure Sentinel.
133133
become: yes
134-
template:
134+
ansible.builtin.template:
135135
src: sentinel.conf.j2
136136
dest: "{{ redis_sentinel_configuration_file }}"
137137
mode: 0640
@@ -146,7 +146,7 @@
146146

147147
- name: Create Redis Lib Directory.
148148
become: yes
149-
file:
149+
ansible.builtin.file:
150150
path: "{{ redis_lib_dir }}"
151151
state: directory
152152
mode: 0770
@@ -155,7 +155,7 @@
155155

156156
- name: Create Redis Log Directory.
157157
become: yes
158-
file:
158+
ansible.builtin.file:
159159
path: "{{ redis_log_dir }}"
160160
state: directory
161161
mode: 0770
@@ -164,7 +164,7 @@
164164

165165
- name: Register Redis Server Service.
166166
become: yes
167-
service:
167+
ansible.builtin.service:
168168
name: "{{ redis_server_service_name }}"
169169
state: started
170170
enabled: yes
@@ -173,7 +173,7 @@
173173

174174
- name: Register Redis Sentinel Service.
175175
become: yes
176-
service:
176+
ansible.builtin.service:
177177
name: "{{ redis_sentinel_service_name }}"
178178
state: started
179179
enabled: yes

0 commit comments

Comments
 (0)