diff --git a/CHANGELOG.md b/CHANGELOG.md index 638d9649..11a80bc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ The **patch** part changes incrementally at each release. ### Added * evomaintenance: database variables must be set or the task fails * redis: Configure munin when working in instance mode +* redis: add a variable to disable the restart handler +* redis: add a variable to force a restart (even with no change) ### Changed * redis: distinction between main and master password diff --git a/redis/defaults/main.yml b/redis/defaults/main.yml index 200d2ca2..8413e0d7 100644 --- a/redis/defaults/main.yml +++ b/redis/defaults/main.yml @@ -40,3 +40,6 @@ redis_protected_mode: "yes" # Add extra include files for local configuration/overrides. redis_includes: [] + +redis_restart_if_needed: True +redis_restart_force: False diff --git a/redis/handlers/main.yml b/redis/handlers/main.yml index ed452e65..c7f66ffb 100644 --- a/redis/handlers/main.yml +++ b/redis/handlers/main.yml @@ -4,6 +4,11 @@ name: "{{ redis_daemon }}" state: restarted +- name: restart redis (noop) + meta: noop + failed_when: False + changed_when: False + - name: restart munin-node service: name: munin-node diff --git a/redis/tasks/main.yml b/redis/tasks/main.yml index 65b065df..58f105d7 100644 --- a/redis/tasks/main.yml +++ b/redis/tasks/main.yml @@ -1,4 +1,8 @@ --- + +- set_fact: + redis_restart_handler_name: "{{ redis_restart_if_needed | ternary('restart redis', 'restart redis (noop)') }}" + - name: Redis is installed. apt: name: "{{ item }}" @@ -32,7 +36,7 @@ src: redis.conf.j2 dest: "{{ redis_conf_path }}" mode: "0644" - notify: restart redis + notify: "{{ redis_restart_handler_name }}" when: redis_instance_name is not defined tags: - redis @@ -86,3 +90,8 @@ tags: - redis - nrpe + +- name: Force restart redis + command: /bin/true + notify: restart redis + when: redis_restart_force