From: Daniel Gryniewicz <dang@redhat.com>
Date: Mon, 2 May 2016 14:33:16 +0000 (-0400)
Subject: Docker fixes and cleanups
X-Git-Tag: v1.0.6~148^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=256775cb0fbc69c6f93affa05c8a8c17099112e8;p=ceph-ansible.git

Docker fixes and cleanups

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
---

diff --git a/roles/ceph-mds/tasks/docker/main.yml b/roles/ceph-mds/tasks/docker/main.yml
index 8750a8259..c867db8d3 100644
--- a/roles/ceph-mds/tasks/docker/main.yml
+++ b/roles/ceph-mds/tasks/docker/main.yml
@@ -9,8 +9,8 @@
   when: ceph_health.rc != 0
 
 - include: pre_requisite.yml
-- include: fetch_configs.yml
 - include: dirs_permissions.yml
+- include: fetch_configs.yml
 
 - include: selinux.yml
   when: ansible_os_family == 'RedHat'
diff --git a/roles/ceph-mon/tasks/docker/main.yml b/roles/ceph-mon/tasks/docker/main.yml
index 960581b7e..b6b668dd3 100644
--- a/roles/ceph-mon/tasks/docker/main.yml
+++ b/roles/ceph-mon/tasks/docker/main.yml
@@ -11,7 +11,7 @@
 
 - name: set fact for using Atomic host
   set_fact:
-      is_atomic='{{ stat_ostree.stat.exists }}'
+      is_atomic: '{{ stat_ostree.stat.exists }}'
 
 - include: checks.yml
   when:
@@ -20,6 +20,8 @@
 
 - include: pre_requisite.yml
 
+- include: dirs_permissions.yml
+
 # let the first mon create configs and keyrings
 - include: create_configs.yml
   when:
@@ -29,8 +31,6 @@
 - include: fetch_configs.yml
   when: not mon_containerized_deployment_with_kv
 
-- include: dirs_permissions.yml
-
 - include: selinux.yml
   when: ansible_os_family == 'RedHat'
 
diff --git a/roles/ceph-osd/tasks/docker/main.yml b/roles/ceph-osd/tasks/docker/main.yml
index 9c959cca4..c934b5a01 100644
--- a/roles/ceph-osd/tasks/docker/main.yml
+++ b/roles/ceph-osd/tasks/docker/main.yml
@@ -16,7 +16,7 @@
 
 - name: set fact for using Atomic host
   set_fact:
-      is_atomic='{{ stat_ostree.stat.exists }}'
+      is_atomic: '{{ stat_ostree.stat.exists }}'
 
 - include: pre_requisite.yml
 
diff --git a/roles/ceph-restapi/tasks/docker/dirs_permissions.yml b/roles/ceph-restapi/tasks/docker/dirs_permissions.yml
index 6b02dbc21..c1425caea 100644
--- a/roles/ceph-restapi/tasks/docker/dirs_permissions.yml
+++ b/roles/ceph-restapi/tasks/docker/dirs_permissions.yml
@@ -29,12 +29,12 @@
   file:
     path: "{{ item }}"
     state: directory
-    owner: ceph
-    group: ceph
+    owner: "64045"
+    group: "64045"
     mode: "0755"
   with_items:
     - /etc/ceph/
     - /var/lib/ceph/bootstrap-osd
     - /var/lib/ceph/bootstrap-mds
     - /var/lib/ceph/bootstrap-rgw
-  when: not after_hamer
+  when: after_hamer
diff --git a/roles/ceph-restapi/tasks/docker/main.yml b/roles/ceph-restapi/tasks/docker/main.yml
index b54b12b5a..6b1488474 100644
--- a/roles/ceph-restapi/tasks/docker/main.yml
+++ b/roles/ceph-restapi/tasks/docker/main.yml
@@ -1,5 +1,5 @@
 ---
 - include: pre_requisite.yml
-- include: fetch_configs.yml
 - include: dirs_permissions.yml
+- include: fetch_configs.yml
 - include: start_docker_restapi.yml