Avoid using tests as filter

Fixes the deprecation warning:

  [DEPRECATION WARNING]: Using tests as filters is deprecated. Instead of
  using `result|search` use `result is search`.

Signed-off-by: Noah Watkins <nwatkins@redhat.com>
(cherry picked from commit 306e308f133c9b9757d6cae5f88d2c39903cae2f)

diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index 4abce2aed99528902c7f191eae5a07aaf32c3a94..f089b203860eb03b6b3ba86bcae0c7f55c180345 100644 (file)
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -398,7 +398,7 @@
       delegate_to: "{{ groups[mon_group_name][0] }}"
       when:
         - (ceph_versions.get('stdout', '{}')|from_json).get('osd', {}) | length == 1
-        - ceph_versions_osd | string | search("ceph version 10")
+        - ceph_versions_osd | string is search("ceph version 10")
         - not jewel_minor_update
 
     - name: get num_pgs - non container
@@ -467,7 +467,7 @@
       delegate_to: "{{ groups[mon_group_name][0] }}"
       when:
         - (ceph_versions.get('stdout', '{}')|from_json).get('osd', {}) | length == 1
-        - ceph_versions_osd | string | search("ceph version 12")
+        - ceph_versions_osd | string is search("ceph version 12")
         - not jewel_minor_update
 
 

diff --git a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
index d11ef0693cae749d954e447efa4e74e80fc8fd78..c8e041a5464dd63e29edc117490ababf9ce16fa6 100644 (file)
--- a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
+++ b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
@@ -76,17 +76,17 @@
     - name: set_fact ceph_uid for ubuntu
       set_fact:
         ceph_uid: 64045
-      when: ceph_docker_image_tag | search("ubuntu")
+      when: ceph_docker_image_tag is search("ubuntu")
 
     - name: set_fact ceph_uid for red hat
       set_fact:
         ceph_uid: 167
-      when: ceph_docker_image_tag | match("latest") or ceph_docker_image_tag | search("centos") or ceph_docker_image_tag | search("fedora")
+      when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("centos") or ceph_docker_image_tag is search("fedora")
 
     - name: set_fact ceph_uid for rhel
       set_fact:
          ceph_uid: 167
-      when: ceph_docker_image | search("rhceph")
+      when: ceph_docker_image is search("rhceph")
 
     - name: set proper ownership on ceph directories
       file:
@@ -158,11 +158,11 @@
 
     - set_fact:
         ceph_uid: 64045
-      when: ceph_docker_image_tag | match("latest") or ceph_docker_image_tag | search("ubuntu")
+      when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("ubuntu")
 
     - set_fact:
         ceph_uid: 167
-      when: ceph_docker_image_tag | search("centos") or ceph_docker_image | search("rhceph") or ceph_docker_image_tag | search("fedora")
+      when: ceph_docker_image_tag is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag is search("fedora")
 
     - name: set proper ownership on ceph directories
       file:
@@ -229,17 +229,17 @@
 
     - set_fact:
         ceph_uid: 64045
-      when: ceph_docker_image_tag | match("latest") or ceph_docker_image_tag | search("ubuntu")
+      when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("ubuntu")
 
     - name: set_fact ceph_uid for red hat
       set_fact:
         ceph_uid: 167
-      when: ceph_docker_image_tag | match("latest") or ceph_docker_image_tag | search("centos") or ceph_docker_image_tag | search("fedora")
+      when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("centos") or ceph_docker_image_tag is search("fedora")
 
     - name: set_fact ceph_uid for rhel
       set_fact:
          ceph_uid: 167
-      when: ceph_docker_image | search("rhceph")
+      when: ceph_docker_image is search("rhceph")
 
     - name: set proper ownership on ceph directories
       file:
@@ -333,11 +333,11 @@
 
     - set_fact:
         ceph_uid: 64045
-      when: ceph_docker_image_tag | match("latest") or ceph_docker_image_tag | search("ubuntu")
+      when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("ubuntu")
 
     - set_fact:
         ceph_uid: 167
-      when: ceph_docker_image_tag | search("centos") or ceph_docker_image | search("rhceph") or ceph_docker_image_tag | search("fedora")
+      when: ceph_docker_image_tag is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag is search("fedora")
 
     - name: set proper ownership on ceph directories
       file:
@@ -375,11 +375,11 @@
 
     - set_fact:
         ceph_uid: 64045
-      when: ceph_docker_image_tag | match("latest") or ceph_docker_image_tag | search("ubuntu")
+      when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("ubuntu")
 
     - set_fact:
         ceph_uid: 167
-      when: ceph_docker_image_tag | search("centos") or ceph_docker_image | search("rhceph") or ceph_docker_image_tag | search("fedora")
+      when: ceph_docker_image_tag is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag is search("fedora")
 
     - name: set proper ownership on ceph directories
       file:
@@ -417,11 +417,11 @@
 
     - set_fact:
         ceph_uid: 64045
-      when: ceph_docker_image_tag | match("latest") or ceph_docker_image_tag | search("ubuntu")
+      when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("ubuntu")
 
     - set_fact:
         ceph_uid: 167
-      when: ceph_docker_image_tag | search("centos") or ceph_docker_image | search("rhceph") or ceph_docker_image_tag | search("fedora")
+      when: ceph_docker_image_tag is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag is search("fedora")
 
     - name: set proper ownership on ceph directories
       file:
@@ -463,11 +463,11 @@
 
     - set_fact:
         ceph_uid: 64045
-      when: ceph_docker_image_tag | match("latest") or ceph_docker_image_tag | search("ubuntu")
+      when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("ubuntu")
 
     - set_fact:
         ceph_uid: 167
-      when: ceph_docker_image_tag | search("centos") or ceph_docker_image | search("rhceph") or ceph_docker_image_tag | search("fedora")
+      when: ceph_docker_image_tag is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag is search("fedora")
 
     - name: set proper ownership on ceph directories
       file:

diff --git a/roles/ceph-common/tasks/checks/check_system.yml b/roles/ceph-common/tasks/checks/check_system.yml
index dc39509d84f0d0e481fad8319ded99a760671ea9..296bf779c39d19222981d12c70eec7bb962fbb20 100644 (file)
--- a/roles/ceph-common/tasks/checks/check_system.yml
+++ b/roles/ceph-common/tasks/checks/check_system.yml
@@ -23,7 +23,7 @@
   when:
     - ansible_distribution == 'Red Hat Enterprise Linux'
     - ceph_repository == 'rhcs'
-    - ansible_distribution_version | version_compare('7.3', '<')
+    - ansible_distribution_version is version_compare('7.3', '<')
 
 - name: determine if node is registered with subscription-manager
   command: subscription-manager identity
@@ -57,7 +57,7 @@
     msg: "Distribution not supported: {{ ansible_distribution }}"
   when:
     - ansible_distribution == 'openSUSE Leap'
-    - ansible_distribution_version | version_compare('42.3', '<')
+    - ansible_distribution_version is version_compare('42.3', '<')
 
 - name: fail on unsupported ansible version
   fail:

diff --git a/roles/ceph-common/tasks/release-rhcs.yml b/roles/ceph-common/tasks/release-rhcs.yml
index 973eb91d969214edcb4d13ee4c7abeee892aee13..d0ac6d3a47086adb00fc5fabc4faeac7bc365f35 100644 (file)
--- a/roles/ceph-common/tasks/release-rhcs.yml
+++ b/roles/ceph-common/tasks/release-rhcs.yml
@@ -3,28 +3,28 @@
   set_fact:
     ceph_release: jewel
   when:
-    - ceph_version.split('.')[0] | version_compare('10', '==')
+    - ceph_version.split('.')[0] is version_compare('10', '==')
 
 - name: set_fact ceph_release kraken
   set_fact:
     ceph_release: kraken
   when:
-    - ceph_version.split('.')[0] | version_compare('11', '==')
+    - ceph_version.split('.')[0] is version_compare('11', '==')
 
 - name: set_fact ceph_release luminous
   set_fact:
     ceph_release: luminous
   when:
-    - ceph_version.split('.')[0] | version_compare('12', '==')
+    - ceph_version.split('.')[0] is version_compare('12', '==')
 
 - name: set_fact ceph_release mimic
   set_fact:
     ceph_release: mimic
   when:
-    - ceph_version.split('.')[0] | version_compare('13', '==')
+    - ceph_version.split('.')[0] is version_compare('13', '==')
 
 - name: set_fact ceph_release nautilus
   set_fact:
     ceph_release: nautilus
   when:
-    - ceph_version.split('.')[0] | version_compare('14', '==')
+    - ceph_version.split('.')[0] is version_compare('14', '==')

diff --git a/roles/ceph-defaults/tasks/facts.yml b/roles/ceph-defaults/tasks/facts.yml
index 68919e99c85fb1d54745b39b0579c71120be4137..0992e8db2c76cea2ef4d6382b8a3fb60fbd3860a 100644 (file)
--- a/roles/ceph-defaults/tasks/facts.yml
+++ b/roles/ceph-defaults/tasks/facts.yml
@@ -206,21 +206,21 @@
     ceph_uid: 64045
   when:
     - containerized_deployment
-    - ceph_docker_image_tag | search("ubuntu")
+    - ceph_docker_image_tag is search("ubuntu")
 
 - name: set_fact ceph_uid for red hat based system - container
   set_fact:
     ceph_uid: 167
   when:
     - containerized_deployment
-    - ceph_docker_image_tag | search("latest") or ceph_docker_image_tag | search("centos") or ceph_docker_image_tag | search("fedora")
+    - ceph_docker_image_tag is search("latest") or ceph_docker_image_tag is search("centos") or ceph_docker_image_tag is search("fedora")
 
 - name: set_fact ceph_uid for red hat
   set_fact:
     ceph_uid: 167
   when:
     - containerized_deployment
-    - ceph_docker_image | search("rhceph")
+    - ceph_docker_image is search("rhceph")
 
 - name: set_fact rgw_hostname
   set_fact:

diff --git a/roles/ceph-docker-common/tasks/release.yml b/roles/ceph-docker-common/tasks/release.yml
index 973eb91d969214edcb4d13ee4c7abeee892aee13..d0ac6d3a47086adb00fc5fabc4faeac7bc365f35 100644 (file)
--- a/roles/ceph-docker-common/tasks/release.yml
+++ b/roles/ceph-docker-common/tasks/release.yml
@@ -3,28 +3,28 @@
   set_fact:
     ceph_release: jewel
   when:
-    - ceph_version.split('.')[0] | version_compare('10', '==')
+    - ceph_version.split('.')[0] is version_compare('10', '==')
 
 - name: set_fact ceph_release kraken
   set_fact:
     ceph_release: kraken
   when:
-    - ceph_version.split('.')[0] | version_compare('11', '==')
+    - ceph_version.split('.')[0] is version_compare('11', '==')
 
 - name: set_fact ceph_release luminous
   set_fact:
     ceph_release: luminous
   when:
-    - ceph_version.split('.')[0] | version_compare('12', '==')
+    - ceph_version.split('.')[0] is version_compare('12', '==')
 
 - name: set_fact ceph_release mimic
   set_fact:
     ceph_release: mimic
   when:
-    - ceph_version.split('.')[0] | version_compare('13', '==')
+    - ceph_version.split('.')[0] is version_compare('13', '==')
 
 - name: set_fact ceph_release nautilus
   set_fact:
     ceph_release: nautilus
   when:
-    - ceph_version.split('.')[0] | version_compare('14', '==')
+    - ceph_version.split('.')[0] is version_compare('14', '==')

diff --git a/roles/ceph-mds/templates/ceph-mds.service.j2 b/roles/ceph-mds/templates/ceph-mds.service.j2
index 1f6f01164843de7d6383a55e08ef81fa802f0526..9e3dcfb5bf0c4bd018fbe92146abaf458ad570c4 100644 (file)
--- a/roles/ceph-mds/templates/ceph-mds.service.j2
+++ b/roles/ceph-mds/templates/ceph-mds.service.j2
@@ -8,7 +8,7 @@ ExecStartPre=-/usr/bin/docker stop ceph-mds-{{ ansible_hostname }}
 ExecStartPre=-/usr/bin/docker rm ceph-mds-{{ ansible_hostname }}
 ExecStart=/usr/bin/docker run --rm --net=host \
   --memory={{ ceph_mds_docker_memory_limit }} \
-  {% if ceph_docker_version.split('.')[0] | version_compare('13', '>=') -%}
+  {% if ceph_docker_version.split('.')[0] is version_compare('13', '>=') -%}
   --cpus={{ ceph_mds_docker_cpu_limit }} \
   {% else -%}
   --cpu-quota={{ ceph_mds_docker_cpu_limit * 100000 }} \

diff --git a/roles/ceph-mgr/templates/ceph-mgr.service.j2 b/roles/ceph-mgr/templates/ceph-mgr.service.j2
index 5c4ef56b660fddd92a99e314428e88d3c6000299..766290e2567ee0674eae091eb5f70080bfaf6ed3 100644 (file)
--- a/roles/ceph-mgr/templates/ceph-mgr.service.j2
+++ b/roles/ceph-mgr/templates/ceph-mgr.service.j2
@@ -8,7 +8,7 @@ ExecStartPre=-/usr/bin/docker stop ceph-mgr-{{ ansible_hostname }}
 ExecStartPre=-/usr/bin/docker rm ceph-mgr-{{ ansible_hostname }}
 ExecStart=/usr/bin/docker run --rm --net=host \
   --memory={{ ceph_mgr_docker_memory_limit }} \
-  {% if ceph_docker_version.split('.')[0] | version_compare('13', '>=') -%}
+  {% if ceph_docker_version.split('.')[0] is version_compare('13', '>=') -%}
   --cpus={{ ceph_mgr_docker_cpu_limit }} \
   {% else -%}
   --cpu-quota={{ ceph_mgr_docker_cpu_limit * 100000 }} \

diff --git a/roles/ceph-mon/tasks/docker/copy_configs.yml b/roles/ceph-mon/tasks/docker/copy_configs.yml
index b08054414a15b0514e8283d738d9c558fd39ee43..b7407a2b3aa7bee0cb7bb2742dfb4a9a0aae1606 100644 (file)
--- a/roles/ceph-mon/tasks/docker/copy_configs.yml
+++ b/roles/ceph-mon/tasks/docker/copy_configs.yml
@@ -43,4 +43,4 @@
     - "{{ statconfig.results }}"
   when:
     - item.1.stat.exists == true
-    - item.0 | search("keyring")
+    - item.0 is search("keyring")

diff --git a/roles/ceph-mon/templates/ceph-mon.service.j2 b/roles/ceph-mon/templates/ceph-mon.service.j2
index 157ab7ca032d14d4e9498f2244ca10c07b61084a..cb7645a498a2981d8f47bc859d87f17566ad909d 100644 (file)
--- a/roles/ceph-mon/templates/ceph-mon.service.j2
+++ b/roles/ceph-mon/templates/ceph-mon.service.j2
@@ -8,7 +8,7 @@ ExecStartPre=-/usr/bin/docker rm ceph-mon-%i
 ExecStartPre=$(command -v mkdir) -p /etc/ceph /var/lib/ceph/mon
 ExecStart=/usr/bin/docker run --rm --name ceph-mon-%i \
   --memory={{ ceph_mon_docker_memory_limit }} \
-{% if ceph_docker_version.split('.')[0] | version_compare('13', '>=') -%}
+{% if ceph_docker_version.split('.')[0] is version_compare('13', '>=') -%}
   --cpus={{ ceph_mon_docker_cpu_limit }} \
 {% else -%}
   --cpu-quota={{ ceph_mon_docker_cpu_limit * 100000 }} \

diff --git a/roles/ceph-osd/templates/ceph-osd-run.sh.j2 b/roles/ceph-osd/templates/ceph-osd-run.sh.j2
index f91166b31a190b4ebecb4e0a8e8d95840b60ebbc..fc8f0a30bc62923679390a4e9ed88c9f8e826696 100644 (file)
--- a/roles/ceph-osd/templates/ceph-osd-run.sh.j2
+++ b/roles/ceph-osd/templates/ceph-osd-run.sh.j2
@@ -61,7 +61,7 @@ expose_partitions "$1"
   --privileged=true \
   --pid=host \
   --memory={{ ceph_osd_docker_memory_limit }} \
-  {% if ceph_docker_version.split('.')[0] | version_compare('13', '>=') -%}
+  {% if ceph_docker_version.split('.')[0] is version_compare('13', '>=') -%}
   --cpus={{ ceph_osd_docker_cpu_limit }} \
   {% else -%}
   --cpu-quota={{ ceph_osd_docker_cpu_limit * 100000 }} \

diff --git a/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2 b/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
index 4f966b2307b6eb3db33b4e78b05dacc4249dd9aa..cd853f77557f70d48cab086e7d82ed7bee736c45 100644 (file)
--- a/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
+++ b/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
@@ -8,7 +8,7 @@ ExecStartPre=-/usr/bin/docker stop ceph-rbd-mirror-{{ ansible_hostname }}
 ExecStartPre=-/usr/bin/docker rm ceph-rbd-mirror-{{ ansible_hostname }}
 ExecStart=/usr/bin/docker run --rm --net=host \
   --memory={{ ceph_rbd_mirror_docker_memory_limit }} \
-  {% if ceph_docker_version.split('.')[0] | version_compare('13', '>=') -%}
+  {% if ceph_docker_version.split('.')[0] is version_compare('13', '>=') -%}
   --cpus={{ ceph_rbd_mirror_docker_cpu_limit }} \
   {% else -%}
   --cpu-quota={{ ceph_rbd_mirror_docker_cpu_limit * 100000 }} \

diff --git a/roles/ceph-rgw/templates/ceph-radosgw.service.j2 b/roles/ceph-rgw/templates/ceph-radosgw.service.j2
index 410e7dffb6a0b9b8175e4f07248cd32ca5ad2f7e..98b6344d3f661b4bfef92226fd8e10e0ade0c6e5 100644 (file)
--- a/roles/ceph-rgw/templates/ceph-radosgw.service.j2
+++ b/roles/ceph-rgw/templates/ceph-radosgw.service.j2
@@ -8,7 +8,7 @@ ExecStartPre=-/usr/bin/docker stop ceph-rgw-{{ ansible_hostname }}
 ExecStartPre=-/usr/bin/docker rm ceph-rgw-{{ ansible_hostname }}
 ExecStart=/usr/bin/docker run --rm --net=host \
   --memory={{ ceph_rgw_docker_memory_limit }} \
-  {% if ceph_docker_version.split('.')[0] | version_compare('13', '>=') -%}
+  {% if ceph_docker_version.split('.')[0] is version_compare('13', '>=') -%}
   --cpus={{ ceph_rgw_docker_cpu_limit }} \
   {% else -%}
   --cpu-quota={{ ceph_rgw_docker_cpu_limit * 100000 }} \