From 37ad65e61c068274c2ed69b96b0ad103a3ffe415 Mon Sep 17 00:00:00 2001
From: Zack Cerza <zack@redhat.com>
Date: Tue, 20 Jun 2017 12:56:46 -0600
Subject: [PATCH] By default, don't use EPEL

Instead, use a repo on ceph.com for now.

Signed-off-by: Zack Cerza <zack@redhat.com>
---
 ansible/common/files/cephmetrics.repo         | 20 +++++++++++++++
 ansible/roles/ceph-collectd/defaults/main.yml |  1 +
 .../ceph-collectd/files/cephmetrics.repo      |  1 +
 .../ceph-collectd/tasks/install_packages.yml  | 22 +++++++++++++++-
 ansible/roles/ceph-grafana/defaults/main.yml  |  1 +
 .../roles/ceph-grafana/files/cephmetrics.repo |  1 +
 .../ceph-grafana/tasks/install_packages.yml   | 25 ++++++++++++++++---
 7 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 ansible/common/files/cephmetrics.repo
 create mode 120000 ansible/roles/ceph-collectd/files/cephmetrics.repo
 create mode 120000 ansible/roles/ceph-grafana/files/cephmetrics.repo

diff --git a/ansible/common/files/cephmetrics.repo b/ansible/common/files/cephmetrics.repo
new file mode 100644
index 0000000..48d8733
--- /dev/null
+++ b/ansible/common/files/cephmetrics.repo
@@ -0,0 +1,20 @@
+[cephmetrics]
+name=cephmetrics packages for \$basearch
+baseurl=https://chacra.ceph.com/r/cephmetrics/master/HEAD/rhel/7/flavors/default/\$basearch
+enabled=1
+gpgcheck=0
+type=rpm-md
+
+[cephmetrics-noarch]
+name=cephmetrics noarch packages
+baseurl=https://chacra.ceph.com/r/cephmetrics/master/HEAD/rhel/7/flavors/default/noarch
+enabled=1
+gpgcheck=0
+type=rpm-md
+
+[cephmetrics-source]
+name=cephmetrics source packages
+baseurl=https://chacra.ceph.com/r/cephmetrics/master/HEAD/rhel/7/flavors/default/SRPMS
+enabled=1
+gpgcheck=0
+type=rpm-md
diff --git a/ansible/roles/ceph-collectd/defaults/main.yml b/ansible/roles/ceph-collectd/defaults/main.yml
index 2f9536f..dfd72c6 100644
--- a/ansible/roles/ceph-collectd/defaults/main.yml
+++ b/ansible/roles/ceph-collectd/defaults/main.yml
@@ -1,3 +1,4 @@
 ---
 containerized_deployment: false
 cluster: ceph
+use_epel: false
diff --git a/ansible/roles/ceph-collectd/files/cephmetrics.repo b/ansible/roles/ceph-collectd/files/cephmetrics.repo
new file mode 120000
index 0000000..2dec932
--- /dev/null
+++ b/ansible/roles/ceph-collectd/files/cephmetrics.repo
@@ -0,0 +1 @@
+../../../common/files/cephmetrics.repo
\ No newline at end of file
diff --git a/ansible/roles/ceph-collectd/tasks/install_packages.yml b/ansible/roles/ceph-collectd/tasks/install_packages.yml
index 6c0ed0d..4d9f2c7 100644
--- a/ansible/roles/ceph-collectd/tasks/install_packages.yml
+++ b/ansible/roles/ceph-collectd/tasks/install_packages.yml
@@ -2,10 +2,30 @@
 - name: Enable EPEL
   yum:
     name: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"
-    state: present
+    state: "{{ 'present' if use_epel else 'absent' }}"
   when: ansible_pkg_mgr == "yum"
 
+- name: Install chacra repo
+  copy:
+    src: cephmetrics.repo
+    dest: /etc/yum.repos.d/cephmetrics.repo
+  when: ansible_pkg_mgr == "yum"
+
+- name: Remove chacra repo
+  file:
+    path: /etc/yum.repos.d/cephmetrics.repo
+    state: absent
+  when: ansible_pkg_mgr == "yum" and use_epel
+
 - name: Install collectd
   package:
     name: collectd
     state: latest
+  notify: Restart collectd
+
+- name: Install collectd-python
+  package:
+    name: collectd-python
+    state: latest
+  when: ansible_pkg_mgr == "yum" and not use_epel
+  notify: Restart collectd
diff --git a/ansible/roles/ceph-grafana/defaults/main.yml b/ansible/roles/ceph-grafana/defaults/main.yml
index 4ed8704..817e2e7 100644
--- a/ansible/roles/ceph-grafana/defaults/main.yml
+++ b/ansible/roles/ceph-grafana/defaults/main.yml
@@ -1,5 +1,6 @@
 ---
 containerized_deployment: false
+use_epel: false
 graphite:
   port: "{{ graphite_port | default('8080') }}"
   user: admin
diff --git a/ansible/roles/ceph-grafana/files/cephmetrics.repo b/ansible/roles/ceph-grafana/files/cephmetrics.repo
new file mode 120000
index 0000000..2dec932
--- /dev/null
+++ b/ansible/roles/ceph-grafana/files/cephmetrics.repo
@@ -0,0 +1 @@
+../../../common/files/cephmetrics.repo
\ No newline at end of file
diff --git a/ansible/roles/ceph-grafana/tasks/install_packages.yml b/ansible/roles/ceph-grafana/tasks/install_packages.yml
index 51e57e9..89af3d6 100644
--- a/ansible/roles/ceph-grafana/tasks/install_packages.yml
+++ b/ansible/roles/ceph-grafana/tasks/install_packages.yml
@@ -1,14 +1,33 @@
 ---
-- yum:
+- name: Enable EPEL
+  yum:
     name: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"
-    state: present
+    state: "{{ 'present' if use_epel else 'absent' }}"
   when: ansible_pkg_mgr == "yum"
 
+- name: Install chacra repo
+  copy:
+    src: files/cephmetrics.repo
+    dest: /etc/yum.repos.d/cephmetrics.repo
+  when: ansible_pkg_mgr == "yum" and not use_epel
+
+- name: Remove chacra repo
+  file:
+    path: /etc/yum.repos.d/cephmetrics.repo
+    state: absent
+  when: ansible_pkg_mgr == "yum" and use_epel
+
 - name: Add Grafana repo
   template:
     src: grafana.repo
     dest: /etc/yum.repos.d/grafana.repo
-  when: ansible_pkg_mgr == "yum"
+  when: ansible_pkg_mgr == 'yum' and use_epel
+
+- name: Remove Grafana repo
+  file:
+    path: /etc/yum.repos.d/grafana.repo
+    state: absent
+  when: ansible_pkg_mgr == "yum" and not use_epel
 
 - name: Install packages
   package: 
-- 
2.47.3