ceph-defaults: fix ceph_uid fact on container deployments

Red Hat is now using tags[3,latest] for image rhceph/rhceph-3-rhel7.
Because of this, the ceph_uid conditional passes for Debian
when 'ceph_docker_image_tag: latest' on RH deployments.
I've added an additional task to check for rhceph image specifically,
and also updated the RH family task for ceph/daemon [centos|fedora]tags.

Signed-off-by: Randy J. Martinez <ramartin@redhat.com>

diff --git a/roles/ceph-defaults/tasks/facts.yml b/roles/ceph-defaults/tasks/facts.yml
index 5c6ec55a820117921bb8089c6e3b07149848fc32..b2c9561ad7859ad7c58eb2d7c4b24b63111f6825 100644 (file)
--- a/roles/ceph-defaults/tasks/facts.yml
+++ b/roles/ceph-defaults/tasks/facts.yml
@@ -192,7 +192,14 @@
     ceph_uid: 167
   when:
     - containerized_deployment
-    - ceph_docker_image_tag | search("latest") or ceph_docker_image_tag | search("centos") or ceph_docker_image | search("rhceph")
+    - ceph_docker_image_tag | search("latest") or ceph_docker_image_tag | search("centos") or ceph_docker_image_tag | search("fedora")
+
+- name: set_fact ceph_uid for Red Hat
+  set_fact:
+    ceph_uid: 167
+  when:
+    - containerized_deployment
+    - ceph_docker_image | search("rhceph")
 
 - name: check if selinux is enabled
   command: getenforce
@@ -201,5 +208,3 @@
   check_mode: no
   when:
     - ansible_os_family == 'RedHat'
-
-