ceph-common: remove copr and sepia repositories

All EL8 dependencies are now present on EPEL 8 so we don't need the
additional repositories that were only a temporary solution.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 3592ba1d61c967de3810850d178a1febf189d309)

diff --git a/roles/ceph-common/tasks/installs/configure_el8_dep.yml b/roles/ceph-common/tasks/installs/configure_el8_dep.yml
deleted file mode 100644 (file)
index a9f264e..0000000
--- a/roles/ceph-common/tasks/installs/configure_el8_dep.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: install dnf-plugins-core
-  package:
-    name: dnf-plugins-core
-  register: result
-  until: result is succeeded
-  tags: with_pkg
-
-- name: enable ceph-el8 copr
-  command: dnf copr enable -y ktdreyer/ceph-el8
-  args:
-    creates: /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:ktdreyer:ceph-el8.repo
-    warn: false
-  register: result
-  until: result is succeeded
-
-- name: enable ceph lab extras repository
-  yum_repository:
-    name: lab-extras
-    baseurl: http://apt-mirror.front.sepia.ceph.com/lab-extras/8/
-    description: Sepia Lab Extras repository
-    enabled: true
-    gpgcheck: false
\ No newline at end of file

diff --git a/roles/ceph-common/tasks/installs/install_on_redhat.yml b/roles/ceph-common/tasks/installs/install_on_redhat.yml
index fd22187d0efb682ebc5e899f64fe14161727637d..93e261484b5dfe113f190f79223ded94be31b511 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_on_redhat.yml
+++ b/roles/ceph-common/tasks/installs/install_on_redhat.yml
@@ -1,10 +1,4 @@
 ---
-- name: include configure_el8_dep.yml
-  include_tasks: configure_el8_dep.yml
-  when:
-    - ceph_origin == 'repository'
-    - ansible_distribution_major_version | int == 8
-
 - name: include configure_redhat_repository_installation.yml
   include_tasks: configure_redhat_repository_installation.yml
   when: ceph_origin == 'repository'