]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
ceph-defaults: fix ceph_uid fact on container deployments
authorRandy J. Martinez <ramartin@redhat.com>
Thu, 29 Mar 2018 04:17:02 +0000 (23:17 -0500)
committerSébastien Han <seb@redhat.com>
Wed, 18 Apr 2018 14:52:28 +0000 (16:52 +0200)
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>
(cherry picked from commit 127a643fd0ce4d66a5243b789ab0905e54e9d960)
Signed-off-by: Sébastien Han <seb@redhat.com>
roles/ceph-defaults/tasks/facts.yml

index 2cb1084301a323a4cff0a19b3f9cbf163e74b24a..7291f90a82496fcce476a5e8170558e1938f9cf9 100644 (file)
     ceph_uid: 167
   when:
     - containerized_deployment
-    - ceph_docker_image_tag | search("centos") or ceph_docker_image | search("rhceph") or ceph_docker_image_tag | search("fedora")
+    - 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
+  register: sestatus
+  changed_when: false
+  check_mode: no
+  when:
+    - ansible_os_family == 'RedHat'