From: Sébastien Han <seb@redhat.com>
Date: Fri, 13 Apr 2018 17:42:17 +0000 (+0200)
Subject: default: extent ceph_uid and gid
X-Git-Tag: v3.1.0beta8~12
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bf1e70e8cf09910a43921bc180543c38e6609d71;p=ceph-ansible.git

default: extent ceph_uid and gid

We now have the ability to detect the uid/gid of the ceph user depending
on the distribution we are running on and so we are doing non-container
deployements.

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/roles/ceph-defaults/tasks/facts.yml b/roles/ceph-defaults/tasks/facts.yml
index b029b6ceb..eb927bcb4 100644
--- a/roles/ceph-defaults/tasks/facts.yml
+++ b/roles/ceph-defaults/tasks/facts.yml
@@ -180,14 +180,28 @@
     - not osd_auto_discovery|default(False)
     - osd_scenario|default('dummy') != 'lvm'
 
-- name: set_fact ceph_uid for debian based system
+- name: set_fact ceph_uid for debian based system - non container
+  set_fact:
+    ceph_uid: 64045
+  when:
+    - not containerized_deployment
+    - ansible_os_family == 'Debian'
+
+- name: set_fact ceph_uid for red hat based system - non container
+  set_fact:
+    ceph_uid: 167
+  when:
+    - not containerized_deployment
+    - ansible_os_family == 'RedHat'
+
+- name: set_fact ceph_uid for debian based system - container
   set_fact:
     ceph_uid: 64045
   when:
     - containerized_deployment
     - ceph_docker_image_tag | search("ubuntu")
 
-- name: set_fact ceph_uid for red hat based system
+- name: set_fact ceph_uid for red hat based system - container
   set_fact:
     ceph_uid: 167
   when: