Drop use_epel flag

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

diff --git a/ansible/README.md b/ansible/README.md
index 32d2e4b8c21e15919c96aca719abb9ea529332ec..53b4ca959a3291837d60418c26910cda4834781f 100644 (file)
--- a/ansible/README.md
+++ b/ansible/README.md
@@ -70,9 +70,6 @@ You may override certain variables by creating a `vars.yml` file:
         baseurl: http://example.com/my/repo
     ```
 
-These variables are only relevent when `devel_mode` is true:
-- `use_epel`: Whether or not to use EPEL and grafana.com instead of ceph.com-sourced packages for dependencies. Default: false
-
 ## Current Limitations
 
 - Currently, metrics are only *displayed* for `osd` and `rgw` hosts.

diff --git a/ansible/roles/ceph-collectd/tasks/install_packages.yml b/ansible/roles/ceph-collectd/tasks/install_packages.yml
index b290ac3b8e552534afd20ad84e9a80c6402d9377..8ada6bdf0d298ec5b510779c81960f8ece3b0e9b 100644 (file)
--- a/ansible/roles/ceph-collectd/tasks/install_packages.yml
+++ b/ansible/roles/ceph-collectd/tasks/install_packages.yml
@@ -7,16 +7,6 @@
     - devel_mode
   notify: Restart collectd
 
-- name: Install collectd-python
-  package:
-    name: collectd-python
-    state: latest
-  when:
-    - ansible_pkg_mgr == "yum"
-    - devel_mode
-    - not use_epel
-  notify: Restart collectd
-
 - name: Install cephmetrics-collectors
   package:
     name: cephmetrics-collectors

diff --git a/ansible/roles/ceph-grafana/tasks/setup_repos.yml b/ansible/roles/ceph-grafana/tasks/setup_repos.yml
index 11fb45312fa4fa09b91cbc2c20ad46898cc87cbe..744ad0198961103acbc05ea8e7bc92144f003f12 100644 (file)
--- a/ansible/roles/ceph-grafana/tasks/setup_repos.yml
+++ b/ansible/roles/ceph-grafana/tasks/setup_repos.yml
@@ -5,19 +5,9 @@
     dest: /etc/yum.repos.d/grafana.repo
   when:
     - ansible_pkg_mgr == 'yum'
-    - use_epel
     - devel_mode
 
-- name: Remove Grafana repo
-  file:
-    path: /etc/yum.repos.d/grafana.repo
-    state: absent
-  when:
-    - ansible_pkg_mgr == "yum"
-    - not use_epel
-    - devel_mode
-
-- name: Install grafana repo
+- name: Add grafana repo
   copy:
     src: files/grafana.list
     dest: /etc/apt/sources.list.d/grafana.list

diff --git a/ansible/roles/cephmetrics-common/defaults/main.yml b/ansible/roles/cephmetrics-common/defaults/main.yml
index d7d135c5ab7071871448b326409fc3a33fb3299e..a7266b686eb8e6205326be156beca6994c76104e 100644 (file)
--- a/ansible/roles/cephmetrics-common/defaults/main.yml
+++ b/ansible/roles/cephmetrics-common/defaults/main.yml
@@ -4,7 +4,6 @@ defaults:
   backend:
     metrics: mgr  # mgr, cephmetrics
     storage: prometheus  # prometheus, graphite
-  use_epel: false
   devel_mode: true
   graphite:
     service: graphite-web

diff --git a/ansible/roles/cephmetrics-common/tasks/setup_repos.yml b/ansible/roles/cephmetrics-common/tasks/setup_repos.yml
index 2f4413b8759a4d666901940b9c2c4e0014d4ea2d..666d29b31210971c2c61ec3efebdddbf676d741f 100644 (file)
--- a/ansible/roles/cephmetrics-common/tasks/setup_repos.yml
+++ b/ansible/roles/cephmetrics-common/tasks/setup_repos.yml
@@ -2,37 +2,11 @@
 - name: Enable EPEL
   yum:
     name: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"
-    state: "{{ 'present' if use_epel else 'absent' }}"
+    state: present
   when:
     - ansible_pkg_mgr == "yum"
     - devel_mode
 
-- name: Install cephmetrics development repo
-  copy:
-    src: files/cephmetrics-devel.repo
-    dest: /etc/yum.repos.d/cephmetrics.repo
-  when:
-    - ansible_pkg_mgr == "yum"
-    - not use_epel
-    - devel_mode
-
-- name: Remove cephmetrics repo
-  file:
-    path: /etc/yum.repos.d/cephmetrics.repo
-    state: absent
-  when:
-    - ansible_pkg_mgr == "yum"
-    - use_epel
-    - devel_mode
-
-- name: Remove old cephmetrics production repo
-  file:
-    path: /etc/yum.repos.d/cephmetrics.repo
-    state: absent
-  when:
-    - ansible_pkg_mgr == "yum"
-    - not devel_mode
-
 - name: Add custom repos
   template:
     src: cephmetrics-custom.repo