Stringify ceph_docker_image_tag

This could be a numeric input, but is treated like a string leading to
runtime errors.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1635823
Signed-off-by: Noah Watkins <nwatkins@redhat.com>
(cherry picked from commit 8dcc8d1434dbe2837d91162f4647246c54826e97)

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 c8e041a5464dd63e29edc117490ababf9ce16fa6..535258cb0361259d5347ca4cc4c652923671d170 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,12 +76,12 @@
     - name: set_fact ceph_uid for ubuntu
       set_fact:
         ceph_uid: 64045
-      when: ceph_docker_image_tag is search("ubuntu")
+      when: ceph_docker_image_tag | string is search("ubuntu")
 
     - name: set_fact ceph_uid for red hat
       set_fact:
         ceph_uid: 167
-      when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("centos") or ceph_docker_image_tag is search("fedora")
+      when: ceph_docker_image_tag | string is match("latest") or ceph_docker_image_tag | string is search("centos") or ceph_docker_image_tag | string is search("fedora")
 
     - name: set_fact ceph_uid for rhel
       set_fact:
@@ -158,11 +158,11 @@
 
     - set_fact:
         ceph_uid: 64045
-      when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("ubuntu")
+      when: ceph_docker_image_tag | string is match("latest") or ceph_docker_image_tag | string is search("ubuntu")
 
     - set_fact:
         ceph_uid: 167
-      when: ceph_docker_image_tag is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag is search("fedora")
+      when: ceph_docker_image_tag | string is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag | string is search("fedora")
 
     - name: set proper ownership on ceph directories
       file:
@@ -229,12 +229,12 @@
 
     - set_fact:
         ceph_uid: 64045
-      when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("ubuntu")
+      when: ceph_docker_image_tag | string is match("latest") or ceph_docker_image_tag | string is search("ubuntu")
 
     - name: set_fact ceph_uid for red hat
       set_fact:
         ceph_uid: 167
-      when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("centos") or ceph_docker_image_tag is search("fedora")
+      when: ceph_docker_image_tag | string is match("latest") or ceph_docker_image_tag | string is search("centos") or ceph_docker_image_tag | string is search("fedora")
 
     - name: set_fact ceph_uid for rhel
       set_fact:
@@ -333,11 +333,11 @@
 
     - set_fact:
         ceph_uid: 64045
-      when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("ubuntu")
+      when: ceph_docker_image_tag | string is match("latest") or ceph_docker_image_tag | string is search("ubuntu")
 
     - set_fact:
         ceph_uid: 167
-      when: ceph_docker_image_tag is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag is search("fedora")
+      when: ceph_docker_image_tag | string is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag | string 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 is match("latest") or ceph_docker_image_tag is search("ubuntu")
+      when: ceph_docker_image_tag | string is match("latest") or ceph_docker_image_tag | string is search("ubuntu")
 
     - set_fact:
         ceph_uid: 167
-      when: ceph_docker_image_tag is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag is search("fedora")
+      when: ceph_docker_image_tag | string is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag | string 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 is match("latest") or ceph_docker_image_tag is search("ubuntu")
+      when: ceph_docker_image_tag | string is match("latest") or ceph_docker_image_tag | string is search("ubuntu")
 
     - set_fact:
         ceph_uid: 167
-      when: ceph_docker_image_tag is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag is search("fedora")
+      when: ceph_docker_image_tag | string is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag | string 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 is match("latest") or ceph_docker_image_tag is search("ubuntu")
+      when: ceph_docker_image_tag | string is match("latest") or ceph_docker_image_tag | string is search("ubuntu")
 
     - set_fact:
         ceph_uid: 167
-      when: ceph_docker_image_tag is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag is search("fedora")
+      when: ceph_docker_image_tag | string is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag | string is search("fedora")
 
     - name: set proper ownership on ceph directories
       file:

diff --git a/roles/ceph-defaults/tasks/facts.yml b/roles/ceph-defaults/tasks/facts.yml
index 0992e8db2c76cea2ef4d6382b8a3fb60fbd3860a..93d49918f2db2c110230577072f1c571c6dc3c1f 100644 (file)
--- a/roles/ceph-defaults/tasks/facts.yml
+++ b/roles/ceph-defaults/tasks/facts.yml
@@ -206,14 +206,14 @@
     ceph_uid: 64045
   when:
     - containerized_deployment
-    - ceph_docker_image_tag is search("ubuntu")
+    - ceph_docker_image_tag | string 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 is search("latest") or ceph_docker_image_tag is search("centos") or ceph_docker_image_tag is search("fedora")
+    - ceph_docker_image_tag | string is search("latest") or ceph_docker_image_tag | string is search("centos") or ceph_docker_image_tag | string is search("fedora")
 
 - name: set_fact ceph_uid for red hat
   set_fact: