From eded11f88fafc9219f9b3553d8c16f334f297ae2 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Tue, 31 Dec 2019 15:32:40 +0100 Subject: [PATCH] Change "|search" with "is search" --- elasticsearch/tasks/additional_scripts.yml | 2 +- etc-git/tasks/repository.yml | 2 +- evocheck/tasks/install_local.yml | 2 +- generate-ldif/tasks/main.yml | 2 +- munin/tasks/main.yml | 2 +- mysql-oracle/tasks/utils.yml | 8 ++++---- mysql/tasks/utils.yml | 8 ++++---- nagios-nrpe/tasks/main.yml | 2 +- webapps/evoadmin-web/tasks/user.yml | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/elasticsearch/tasks/additional_scripts.yml b/elasticsearch/tasks/additional_scripts.yml index 96d10d4b..19e43535 100644 --- a/elasticsearch/tasks/additional_scripts.yml +++ b/elasticsearch/tasks/additional_scripts.yml @@ -2,7 +2,7 @@ - include_role: name: evolix/remount-usr - when: elasticsearch_additional_scripts_dir | search ("/usr") + when: elasticsearch_additional_scripts_dir is search ("/usr") - name: "{{ elasticsearch_additional_scripts_dir }} exists" file: diff --git a/etc-git/tasks/repository.yml b/etc-git/tasks/repository.yml index 04078836..1430c5bd 100644 --- a/etc-git/tasks/repository.yml +++ b/etc-git/tasks/repository.yml @@ -2,7 +2,7 @@ - include_role: name: evolix/remount-usr - when: repository_path | search ("/usr") + when: repository_path is search ("/usr") - name: "{{ repository_path }} is versioned with git" command: "git init ." diff --git a/evocheck/tasks/install_local.yml b/evocheck/tasks/install_local.yml index cb390cd2..7d4a0e6a 100644 --- a/evocheck/tasks/install_local.yml +++ b/evocheck/tasks/install_local.yml @@ -1,7 +1,7 @@ --- - include_role: name: evolix/remount-usr - when: evocheck_bin_dir | search ("/usr") + when: evocheck_bin_dir is search ("/usr") tags: - evocheck diff --git a/generate-ldif/tasks/main.yml b/generate-ldif/tasks/main.yml index 4ff7e376..019f5a83 100644 --- a/generate-ldif/tasks/main.yml +++ b/generate-ldif/tasks/main.yml @@ -1,7 +1,7 @@ --- - include_role: name: evolix/remount-usr - when: general_scripts_dir | search("/usr") + when: general_scripts_dir is search("/usr") - name: "copy generateldif.sh" template: diff --git a/munin/tasks/main.yml b/munin/tasks/main.yml index 19ad7c40..344962f8 100644 --- a/munin/tasks/main.yml +++ b/munin/tasks/main.yml @@ -87,4 +87,4 @@ [swap] user root - when: ansible_kernel | search("-grs-") + when: ansible_kernel is search("-grs-") diff --git a/mysql-oracle/tasks/utils.yml b/mysql-oracle/tasks/utils.yml index a0e3b754..9c3ceb8e 100644 --- a/mysql-oracle/tasks/utils.yml +++ b/mysql-oracle/tasks/utils.yml @@ -2,7 +2,7 @@ - include_role: name: evolix/remount-usr - when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr") + when: (mysql_scripts_dir or general_scripts_dir) is search ("/usr") - name: Scripts directory exists file: @@ -95,7 +95,7 @@ name: evolix/remount-usr tags: - mysql - when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr") + when: (mysql_scripts_dir or general_scripts_dir) is search ("/usr") - name: mysqltuner is installed # copy: @@ -121,7 +121,7 @@ name: evolix/remount-usr tags: - mysql - when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr") + when: (mysql_scripts_dir or general_scripts_dir) is search ("/usr") - name: mysql-optimize.sh is installed copy: @@ -192,7 +192,7 @@ - include_role: name: evolix/remount-usr - when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr") + when: (mysql_scripts_dir or general_scripts_dir) is search ("/usr") - name: Install my-add.sh copy: diff --git a/mysql/tasks/utils.yml b/mysql/tasks/utils.yml index 91c5d442..322f21c8 100644 --- a/mysql/tasks/utils.yml +++ b/mysql/tasks/utils.yml @@ -2,7 +2,7 @@ - include_role: name: evolix/remount-usr - when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr") + when: (mysql_scripts_dir or general_scripts_dir) is search ("/usr") - name: Ensure scripts directory exists file: @@ -62,7 +62,7 @@ - include_role: name: evolix/remount-usr - when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr") + when: (mysql_scripts_dir or general_scripts_dir) is search ("/usr") - name: Install mysqltuner # copy: @@ -98,7 +98,7 @@ - include_role: name: evolix/remount-usr - when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr") + when: (mysql_scripts_dir or general_scripts_dir) is search ("/usr") - name: Optimize script for MySQL copy: @@ -162,7 +162,7 @@ - include_role: name: evolix/remount-usr - when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr") + when: (mysql_scripts_dir or general_scripts_dir) is search ("/usr") - name: Install my-add.sh copy: diff --git a/nagios-nrpe/tasks/main.yml b/nagios-nrpe/tasks/main.yml index 6e876589..7125cbf7 100644 --- a/nagios-nrpe/tasks/main.yml +++ b/nagios-nrpe/tasks/main.yml @@ -46,7 +46,7 @@ - include_role: name: evolix/remount-usr - when: nagios_plugins_directory | search ("/usr") + when: nagios_plugins_directory is search ("/usr") tags: - nagios-nrpe - nagios-plugins diff --git a/webapps/evoadmin-web/tasks/user.yml b/webapps/evoadmin-web/tasks/user.yml index c649224c..7ca5d63c 100644 --- a/webapps/evoadmin-web/tasks/user.yml +++ b/webapps/evoadmin-web/tasks/user.yml @@ -80,7 +80,7 @@ - include_role: name: evolix/remount-usr - when: evoadmin_scripts_dir | search ("/usr") + when: evoadmin_scripts_dir is search ("/usr") - name: "Create {{ evoadmin_scripts_dir }}" file: