ceph-grafana: Initial Ubuntu support

This commit lets us grab upstream Grafana packages in devel_mode

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 b2566e9e35cc8b198b6c1f7c4be1a6de1e7479b7..df4e55fbb2f5c83a6bc37f875de8c6a313b3875c 100644 (file)
--- a/ansible/roles/ceph-grafana/defaults/main.yml
+++ b/ansible/roles/ceph-grafana/defaults/main.yml
@@ -14,3 +14,17 @@ firewalld_zone: public
 rhsm_repos:
   - rhel-7-server-rhscon-2-installer-rpms
   - rhel-7-server-optional-rpms
+devel_packages:
+  yum:
+    # unzip is needed to extract the Vonage plugin
+    - unzip
+    - graphite-web
+    - python-carbon
+    - grafana
+  apt:
+    # unzip is needed to extract the Vonage plugin
+    - unzip
+    - grafana
+    # for dashUpdater.py
+    - python-yaml
+    - python-requests

diff --git a/ansible/roles/ceph-grafana/files/grafana.list b/ansible/roles/ceph-grafana/files/grafana.list
new file mode 100644 (file)
index 0000000..886da8d
--- /dev/null
+++ b/ansible/roles/ceph-grafana/files/grafana.list
@@ -0,0 +1 @@
+deb https://packagecloud.io/grafana/stable/debian/ jessie main

diff --git a/ansible/roles/ceph-grafana/tasks/install_packages.yml b/ansible/roles/ceph-grafana/tasks/install_packages.yml
index 81d6efefedf6417771c1764e7c179499901129b6..9dfdbebabd19f37f364398ca38c98a1a4264b459 100644 (file)
--- a/ansible/roles/ceph-grafana/tasks/install_packages.yml
+++ b/ansible/roles/ceph-grafana/tasks/install_packages.yml
@@ -3,12 +3,7 @@
   package:
     name: "{{ item }}"
     state: latest
-  with_items:
-    # unzip is needed to extract the Vonage plugin
-    - unzip
-    - graphite-web
-    - python-carbon
-    - grafana
+  with_items: "{{ devel_packages[ansible_pkg_mgr] }}"
   when: devel_mode
 
 - name: Install cephmetrics

diff --git a/ansible/roles/ceph-grafana/tasks/setup_repos.yml b/ansible/roles/ceph-grafana/tasks/setup_repos.yml
index 8136d811fbda953a56d6a0ba93b9ebc607a6f52f..e793626920c89b6bc74ea1a40634657be798ca57 100644 (file)
--- a/ansible/roles/ceph-grafana/tasks/setup_repos.yml
+++ b/ansible/roles/ceph-grafana/tasks/setup_repos.yml
@@ -43,6 +43,31 @@
     - not use_epel
     - devel_mode
 
+- name: Install grafana repo
+  copy:
+    src: files/grafana.list
+    dest: /etc/apt/sources.list.d/grafana.list
+  when:
+    - ansible_pkg_mgr == "apt"
+    - devel_mode
+
+- name: Add packagecloud GPG key to apt
+  apt_key:
+    # This is the key used by the grafana repo
+    url: https://packagecloud.io/gpg.key
+    id: D59097AB
+    state: present
+  when:
+    - ansible_pkg_mgr == "apt"
+    - devel_mode
+
+- name: Update apt cache
+  apt:
+    update_cache: true
+  when:
+    - ansible_pkg_mgr == 'apt'
+    - devel_mode
+
 - name: Enable subscription-manager repos
   command: "subscription-manager repos{% for repo in rhsm_repos %} --enable={{ repo }}{% endfor %}"
   when: