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>
pull/2468/merge
Randy J. Martinez 2018-03-28 23:17:02 -05:00 committed by Sébastien Han
parent a98885a71e
commit 127a643fd0
1 changed files with 8 additions and 3 deletions

View File

@ -192,7 +192,14 @@
ceph_uid: 167 ceph_uid: 167
when: when:
- containerized_deployment - 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 - name: check if selinux is enabled
command: getenforce command: getenforce
@ -201,5 +208,3 @@
check_mode: no check_mode: no
when: when:
- ansible_os_family == 'RedHat' - ansible_os_family == 'RedHat'