By default, don't use EPEL

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

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

diff --git a/ansible/common/files/cephmetrics.repo b/ansible/common/files/cephmetrics.repo
new file mode 100644 (file)
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 2f9536fe07c42cb2cdda797c55c71377691b9f20..dfd72c6e91f6caae69f950cd3433353503c77232 100644 (file)
--- 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 (symlink)
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 6c0ed0d99e0461bf8990498ee803ccaf70379b76..4d9f2c7462c3b940924e9c9eebb6b2c1d3b78a65 100644 (file)
--- 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 4ed8704186b612f34e0d86324faeda6867f3e88b..817e2e7d9af16cd6ede1e503154b4adb92f61e95 100644 (file)
--- 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 (symlink)
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 51e57e9f44532f5804254485423712735ac19be1..89af3d67ef6c675ffc26fd076e1cc00f1e58ff8a 100644 (file)
--- 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: