ceph-grafana: Use the correct UID for 5.1.x

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/ansible/roles/ceph-grafana/defaults/main.yml b/ansible/roles/ceph-grafana/defaults/main.yml
index 745670925d97ebb2e4161d1fcddca1f4ba11b726..089759f4d7dd53b625c62a3b29b8dbee7422b8e7 100644 (file)
--- 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 51f28d0804ee672456ef3ab6afd83473db87586b..31edf01395babb3bd90b39b73fffcc30ee85dbd6 100644 (file)
--- 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 a6fed77f4c7408a54f2021f1c33069717b83216a..c29edff208596f9f3d1e1ff82aa42ad927d5869e 100644 (file)
--- 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: