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>

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 f9ec87c1f25b03fb91be7f950f32bc531514a864..296edd446b38aab7539920ba4a1f7d2cd4ffb62b 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:
@@ -159,11 +159,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:
@@ -231,12 +231,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:
@@ -336,11 +336,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:
@@ -379,11 +379,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:
@@ -422,11 +422,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:
@@ -469,11 +469,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 bfa4aafee81bc685ef3a902d6c562b7998a6a688..ab899d648ad85d360ef379a60f5c71fe66892bb3 100644 (file)
--- a/roles/ceph-defaults/tasks/facts.yml
+++ b/roles/ceph-defaults/tasks/facts.yml
@@ -209,14 +209,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: