From 94b6a20ed66fd4d06e02cfe6c6436d015d59c4e8 Mon Sep 17 00:00:00 2001
From: Zack Cerza <zack@redhat.com>
Date: Mon, 21 May 2018 16:56:00 -0600
Subject: [PATCH] ceph-grafana: Use the correct UID for 5.1.x

Signed-off-by: Zack Cerza <zack@redhat.com>
---
 ansible/roles/ceph-grafana/defaults/main.yml     |  1 +
 .../ceph-grafana/tasks/configure_grafana.yml     |  2 +-
 .../roles/ceph-grafana/tasks/setup_container.yml | 16 +++++++---------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ansible/roles/ceph-grafana/defaults/main.yml b/ansible/roles/ceph-grafana/defaults/main.yml
index 7456709..089759f 100644
--- a/ansible/roles/ceph-grafana/defaults/main.yml
+++ b/ansible/roles/ceph-grafana/defaults/main.yml
@@ -12,6 +12,7 @@ defaults:
     container_memory: 4
     # version currently only applies to containers
     version: 5.1.3
+    uid: 472
     datasource: Local
     # You need to change these in the web UI on an already deployed machine, first
     # New deployments work fine
diff --git a/ansible/roles/ceph-grafana/tasks/configure_grafana.yml b/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
index 51f28d0..31edf01 100644
--- a/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
+++ b/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
@@ -23,7 +23,7 @@
     path: /etc/grafana
     state: directory
     # This is the UID used by the grafana/grafana container
-    owner: 104
+    owner: "{{ grafana.uid }}"
     recurse: true
   when:
     - containerized
diff --git a/ansible/roles/ceph-grafana/tasks/setup_container.yml b/ansible/roles/ceph-grafana/tasks/setup_container.yml
index a6fed77..c29edff 100644
--- a/ansible/roles/ceph-grafana/tasks/setup_container.yml
+++ b/ansible/roles/ceph-grafana/tasks/setup_container.yml
@@ -13,17 +13,15 @@
     createhome: false
     system: true
 
-- name: Create /etc/grafana
+- name: Create /etc/grafana and /var/lib/grafana
   file:
-    path: /etc/grafana
+    path: "{{ item }}"
     state: directory
-    owner: root
-
-- name: Create /var/lib/grafana
-  file:
-    path: /var/lib/grafana
-    state: directory
-    owner: root
+    owner: "{{ grafana.uid }}"
+    recurse: true
+  with_items:
+    - /etc/grafana
+    - /var/lib/grafana
 
 - name: Create docker container
   docker_container:
-- 
2.47.3