Ship grafana.ini from this repo

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

diff --git a/ansible/roles/ceph-grafana/files/grafana.ini b/ansible/roles/ceph-grafana/files/grafana.ini
new file mode 120000 (symlink)
index 0000000..d27ea1e
--- /dev/null
+++ b/ansible/roles/ceph-grafana/files/grafana.ini
@@ -0,0 +1 @@
+../../../../etc/grafana/grafana.ini
\ No newline at end of file

diff --git a/ansible/roles/ceph-grafana/tasks/configure_grafana.yml b/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
index ca516fdc5e93ecfd88bd3bd91c8f90203fcd068f..20b1a11e7498c567ae8529ed0dc77e2b589fca01 100644 (file)
--- a/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
+++ b/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
@@ -52,21 +52,22 @@
     status_code: 200
   when: grafana_data_source_result is defined and grafana_data_source_result.status == 409
 
-- name: Set domain in grafana.ini
-  lineinfile:
+- name: Write grafana.ini
+  copy:
+    src: files/grafana.ini
     dest: /etc/grafana/grafana.ini
-    regexp: "^domain = .*"
-    insertafter: "^;domain = .*"
-    line: "domain = {{ ansible_fqdn }}"
+    owner: root
+    group: grafana
+    mode: 0640
   tags: [ini]
   notify: Restart Grafana
 
-- name: Set root_url in grafana.ini
+- name: Set domain in grafana.ini
   lineinfile:
     dest: /etc/grafana/grafana.ini
-    regexp: "^root_url = .*"
-    insertafter: "^;root_url = .*"
-    line: "root_url = %(protocol)s://%(domain)s:3000"
+    regexp: "^domain = .*"
+    insertafter: "^;domain = .*"
+    line: "domain = {{ ansible_fqdn }}"
   tags: [ini]
   notify: Restart Grafana