1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-02-04 07:51:50 +00:00

[stable-8] redis_info: adjust tests for Arch Linux (#10132)

* Cherry-pick parts of bf69dc46ff.

* redis_info: adjust tests for Arch Linux (#10129)

(cherry picked from commit e853a6f39b)
This commit is contained in:
Felix Fontein 2025-05-14 07:34:39 +02:00 committed by GitHub
parent cec5b112c9
commit be3c3c3f45
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 6 deletions

View file

@ -8,7 +8,7 @@ redis_packages:
Alpine:
- redis
Archlinux:
- redis
- valkey
Debian:
- redis-server
Ubuntu:
@ -22,13 +22,23 @@ redis_packages:
FreeBSD:
- redis
redis_user:
Alpine: redis
Archlinux: valkey
Debian: redis
Ubuntu: redis
openSUSE Leap: redis
Fedora: "{{ '998' if ansible_distribution_major_version is version('41', '>=') else 'redis' }}"
CentOS: redis
FreeBSD: redis
redis_bin:
Alpine: /usr/bin/redis-server
Archlinux: /usr/bin/redis-server
Debian: /usr/bin/redis-server
Ubuntu: /usr/bin/redis-server
openSUSE Leap: /usr/sbin/redis-server
Fedora: /usr/bin/redis-server
Fedora: "/usr/bin/{{ 'valkey-server' if ansible_distribution_major_version is version('41', '>=') else 'redis-server' }}"
CentOS: /usr/bin/redis-server
FreeBSD: /usr/local/bin/redis-server

View file

@ -24,8 +24,8 @@
file:
path: "{{ item }}"
state: directory
owner: redis
group: redis
owner: "{{ redis_user[ansible_distribution] }}"
group: "{{ redis_user[ansible_distribution] }}"
loop:
- "{{ master_datadir }}"
- "{{ master_logdir }}"
@ -54,10 +54,10 @@
datadir: "{{ replica_datadir }}"
- name: Start redis master
shell: "{{ redis_bin[ansible_distribution] }} {{ master_conf }}"
ansible.builtin.command: "{{ redis_bin[ansible_distribution] }} {{ master_conf }}"
- name: Start redis replica
shell: "{{ redis_bin[ansible_distribution] }} {{ replica_conf }} --{% if old_redis %}slaveof{% else %}replicaof{% endif %} 127.0.0.1 {{ master_port }}"
ansible.builtin.command: "{{ redis_bin[ansible_distribution] }} {{ replica_conf }} --{% if old_redis %}slaveof{% else %}replicaof{% endif %} 127.0.0.1 {{ master_port }}"
- name: Wait for redis master to be started
ansible.builtin.wait_for: