From 48fd6e6b163f0a8c80f3a993cedcdae9ca754190 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Wed, 17 Jun 2020 14:15:32 -0400 Subject: [PATCH] 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 (cherry picked from commit 3592ba1d61c967de3810850d178a1febf189d309) --- .../tasks/installs/configure_el8_dep.yml | 23 ------------------- .../tasks/installs/install_on_redhat.yml | 6 ----- 2 files changed, 29 deletions(-) delete mode 100644 roles/ceph-common/tasks/installs/configure_el8_dep.yml 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 index a9f264e78..000000000 --- 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 fd22187d0..93e261484 100644 --- 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' -- 2.39.5