From aca146adbcd6e9decb657d71edfa0b833e06816a Mon Sep 17 00:00:00 2001 From: Ludovic Poujol Date: Mon, 11 Mar 2024 10:54:36 +0100 Subject: [PATCH] memcached: Fix conditions not properly writen (installation was always in multi-instance mode) --- CHANGELOG.md | 1 + memcached/tasks/main.yml | 4 ++-- memcached/tasks/munin.yml | 2 +- memcached/tasks/nrpe.yml | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19caa254..dccbbc99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ The **patch** part is incremented if multiple releases happen the same month * certbot: Fix HAProxy renewal hook * keepalived: Fix tasks that use file instead of copy +* memcached: Fix conditions not properly writen (installation was always in multi-instance mode) ### Removed diff --git a/memcached/tasks/main.yml b/memcached/tasks/main.yml index 96060d4a..05455c0b 100644 --- a/memcached/tasks/main.yml +++ b/memcached/tasks/main.yml @@ -6,10 +6,10 @@ - memcached - ansible.builtin.include: instance-default.yml - when: memcached_instance_name is undefined + when: memcached_instance_name | length == 0 - ansible.builtin.include: instance-multi.yml - when: memcached_instance_name is defined + when: memcached_instance_name | length > 0 - ansible.builtin.include: munin.yml diff --git a/memcached/tasks/munin.yml b/memcached/tasks/munin.yml index b25b9275..f4b262a9 100644 --- a/memcached/tasks/munin.yml +++ b/memcached/tasks/munin.yml @@ -2,7 +2,7 @@ - name: Choose packages (Oracle) ansible.builtin.set_fact: multi: "multi_" - when: memcached_instance_name is defined + when: memcached_instance_name | length > 0 - name: is Munin present ? ansible.builtin.stat: diff --git a/memcached/tasks/nrpe.yml b/memcached/tasks/nrpe.yml index aba43da6..70c69c00 100644 --- a/memcached/tasks/nrpe.yml +++ b/memcached/tasks/nrpe.yml @@ -36,7 +36,7 @@ regexp: '^command\[check_memcached\]=' line: 'command[check_memcached]=/usr/local/lib/nagios/plugins/check_memcached.pl -H 127.0.0.1 -p {{ memcached_port }}' notify: restart nagios-nrpe-server - when: memcached_instance_name is undefined + when: memcached_instance_name | length == 0 - name: Add NRPE check (multi instance) ansible.builtin.lineinfile: @@ -44,6 +44,6 @@ regexp: '^command\[check_memcached\]=' line: 'command[check_memcached]=/usr/local/lib/nagios/plugins/check_memcached_instances' notify: restart nagios-nrpe-server - when: memcached_instance_name is defined + when: memcached_instance_name | length > 0 when: nrpe_evolix_config.stat.exists