From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 25 Mar 2020 17:07:24 +0000 (+0100)
Subject: common: add el8 repo configuration
X-Git-Tag: v5.0.0~76
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9aa8e9aff16d95f139f5626b290f2e2a99ca2b68;p=ceph-ansible.git

common: add el8 repo configuration

This commit adds el8 repo configuration since we are still missing these
packages in el8.

This is only intended to make CI passing on stable-5.0 and *must* be
reverted once these packages will be available.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/roles/ceph-common/tasks/installs/configure_el8_dep.yml b/roles/ceph-common/tasks/installs/configure_el8_dep.yml
new file mode 100644
index 000000000..b0fbd70ac
--- /dev/null
+++ b/roles/ceph-common/tasks/installs/configure_el8_dep.yml
@@ -0,0 +1,16 @@
+---
+- 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 93e261484..5a52d0f6b 100644
--- a/roles/ceph-common/tasks/installs/install_on_redhat.yml
+++ b/roles/ceph-common/tasks/installs/install_on_redhat.yml
@@ -1,4 +1,8 @@
 ---
+- name: include configure_el8_dep.yml
+  include_tasks: configure_el8_dep.yml
+  when: ceph_origin == 'repository'
+
 - name: include configure_redhat_repository_installation.yml
   include_tasks: configure_redhat_repository_installation.yml
   when: ceph_origin == 'repository'
diff --git a/roles/ceph-common/tasks/installs/redhat_dev_repository.yml b/roles/ceph-common/tasks/installs/redhat_dev_repository.yml
index 85a32a1ab..2cf0d3eaf 100644
--- a/roles/ceph-common/tasks/installs/redhat_dev_repository.yml
+++ b/roles/ceph-common/tasks/installs/redhat_dev_repository.yml
@@ -6,22 +6,6 @@
   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
-
 - name: fetch ceph red hat development repository
   uri:
     # Use the centos repo since we don't currently have a dedicated red hat repo