ansible: Remove old production repo

We no longer use download.ceph.com as a production repo. We should
be removing instead of installing it.

Signed-off-by: Boris Ranto <branto@redhat.com>

diff --git a/ansible/common/files/cephmetrics-prod.repo b/ansible/common/files/cephmetrics-prod.repo
deleted file mode 100644 (file)
index 990a5bc..0000000
--- a/ansible/common/files/cephmetrics-prod.repo
+++ /dev/null
@@ -1,20 +0,0 @@
-[cephmetrics]
-name=cephmetrics packages for \$basearch
-baseurl=http://download.ceph.com/cephmetrics/rpm-master/el7/\$basearch
-enabled=1
-gpgcheck=0
-type=rpm-md
-
-[cephmetrics-noarch]
-name=cephmetrics noarch packages
-baseurl=http://download.ceph.com/cephmetrics/rpm-master/el7/noarch
-enabled=1
-gpgcheck=0
-type=rpm-md
-
-[cephmetrics-source]
-name=cephmetrics source packages
-baseurl=http://download.ceph.com/cephmetrics/rpm-master/el7/SRPMS
-enabled=0
-gpgcheck=0
-type=rpm-md

diff --git a/ansible/roles/ceph-collectd/tasks/setup_repos.yml b/ansible/roles/ceph-collectd/tasks/setup_repos.yml
index 226d391fab4d1dd519e29e2b4f86aceceb239616..7d867a1536fd53cf865ff0b1027d4acfdd173627 100644 (file)
--- a/ansible/roles/ceph-collectd/tasks/setup_repos.yml
+++ b/ansible/roles/ceph-collectd/tasks/setup_repos.yml
@@ -48,10 +48,10 @@
     - use_epel
     - devel_mode
 
-- name: Install cephmetrics production repo
-  copy:
-    src: files/cephmetrics-prod.repo
-    dest: /etc/yum.repos.d/cephmetrics.repo
+- name: Remove old cephmetrics production repo
+  file:
+    path: /etc/yum.repos.d/cephmetrics.repo
+    state: absent
   when:
     - ansible_pkg_mgr == "yum"
     - not devel_mode

diff --git a/ansible/roles/ceph-grafana/tasks/setup_repos.yml b/ansible/roles/ceph-grafana/tasks/setup_repos.yml
index e793626920c89b6bc74ea1a40634657be798ca57..38bd5caf10dfb6e91fec6763309a9970b8e3c880 100644 (file)
--- a/ansible/roles/ceph-grafana/tasks/setup_repos.yml
+++ b/ansible/roles/ceph-grafana/tasks/setup_repos.yml
@@ -74,10 +74,10 @@
     - ansible_pkg_mgr == "yum"
     - not devel_mode
 
-- name: Install cephmetrics production repo
-  copy:
-    src: files/cephmetrics-prod.repo
-    dest: /etc/yum.repos.d/cephmetrics.repo
+- name: Remove old cephmetrics production repo
+  file:
+    path: /etc/yum.repos.d/cephmetrics.repo
+    state: absent
   when:
     - ansible_pkg_mgr == "yum"
     - not devel_mode