More ansible-lint fixes

This commit is contained in:
Slavi Pantaleev
2022-07-18 11:22:05 +03:00
parent 34cdaade08
commit ddf18eadc7
337 changed files with 1720 additions and 1720 deletions

View File

@ -2,4 +2,4 @@
- ansible.builtin.set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-redis'] }}"
when: matrix_redis_enabled|bool
when: matrix_redis_enabled | bool

View File

@ -1,11 +1,11 @@
---
- import_tasks: "{{ role_path }}/tasks/init.yml"
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/init.yml"
tags:
- always
- import_tasks: "{{ role_path }}/tasks/setup_redis.yml"
when: run_setup|bool
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_redis.yml"
when: run_setup | bool
tags:
- setup-all
- setup-redis

View File

@ -10,7 +10,7 @@
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_redis_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_redis_docker_image_force_pull }}"
when: matrix_redis_enabled|bool
when: matrix_redis_enabled | bool
register: result
retries: "{{ matrix_container_retries_count }}"
delay: "{{ matrix_container_retries_delay }}"
@ -26,7 +26,7 @@
with_items:
- "{{ matrix_redis_base_path }}"
- "{{ matrix_redis_data_path }}"
when: matrix_redis_enabled|bool
when: matrix_redis_enabled | bool
# We do this as a separate task, because:
# - we'd like to do it for the data path only, not for the base path (which contains root-owned environment variable files we'd like to leave as-is)
@ -38,7 +38,7 @@
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_username }}"
recurse: true
when: matrix_redis_enabled|bool
when: matrix_redis_enabled | bool
- name: Ensure redis environment variables file created
ansible.builtin.template:
@ -47,7 +47,7 @@
mode: 0644
with_items:
- "redis.conf"
when: matrix_redis_enabled|bool
when: matrix_redis_enabled | bool
- name: Ensure matrix-redis.service installed
ansible.builtin.template:
@ -55,22 +55,22 @@
dest: "{{ matrix_systemd_path }}/matrix-redis.service"
mode: 0644
register: matrix_redis_systemd_service_result
when: matrix_redis_enabled|bool
when: matrix_redis_enabled | bool
- name: Ensure systemd reloaded after matrix-redis.service installation
ansible.builtin.service:
daemon_reload: true
when: "matrix_redis_enabled|bool and matrix_redis_systemd_service_result.changed"
when: "matrix_redis_enabled | bool and matrix_redis_systemd_service_result.changed"
#
# Tasks related to getting rid of the internal redis server (if it was previously enabled)
#
- name: Check existence of matrix-redis service
stat:
ansible.builtin.stat:
path: "{{ matrix_systemd_path }}/matrix-redis.service"
register: matrix_redis_service_stat
when: "not matrix_redis_enabled|bool"
when: "not matrix_redis_enabled | bool"
- name: Ensure matrix-redis is stopped
ansible.builtin.service:
@ -78,27 +78,27 @@
state: stopped
enabled: false
daemon_reload: true
when: "not matrix_redis_enabled|bool and matrix_redis_service_stat.stat.exists"
when: "not matrix_redis_enabled | bool and matrix_redis_service_stat.stat.exists"
- name: Ensure matrix-redis.service doesn't exist
ansible.builtin.file:
path: "{{ matrix_systemd_path }}/matrix-redis.service"
state: absent
when: "not matrix_redis_enabled|bool and matrix_redis_service_stat.stat.exists"
when: "not matrix_redis_enabled | bool and matrix_redis_service_stat.stat.exists"
- name: Ensure systemd reloaded after matrix-redis.service removal
ansible.builtin.service:
daemon_reload: true
when: "not matrix_redis_enabled|bool and matrix_redis_service_stat.stat.exists"
when: "not matrix_redis_enabled | bool and matrix_redis_service_stat.stat.exists"
- name: Check existence of matrix-redis local data path
stat:
ansible.builtin.stat:
path: "{{ matrix_redis_data_path }}"
register: matrix_redis_data_path_stat
when: "not matrix_redis_enabled|bool"
when: "not matrix_redis_enabled | bool"
# We just want to notify the user. Deleting data is too destructive.
- name: Notify if matrix-redis local data remains
ansible.builtin.debug:
msg: "Note: You are not using a local redis instance, but some old data remains from before in `{{ matrix_redis_data_path }}`. Feel free to delete it."
when: "not matrix_redis_enabled|bool and matrix_redis_data_path_stat.stat.exists"
when: "not matrix_redis_enabled | bool and matrix_redis_data_path_stat.stat.exists"