From: David Galloway <dgallowa@redhat.com>
Date: Thu, 12 Dec 2019 16:46:39 +0000 (-0500)
Subject: testnode: Support adding copr repos
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=357af33f7238ea5c76d6203e27bcfe83e12c9395;p=ceph-cm-ansible.git

testnode: Support adding copr repos

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/roles/testnode/README.rst b/roles/testnode/README.rst
index ada57c5..2ac60a8 100644
--- a/roles/testnode/README.rst
+++ b/roles/testnode/README.rst
@@ -85,6 +85,14 @@ will be used as the properties for the repo file::
         gpgcheck: 0
         priority: 0
 
+A list of copr repos to enable using ``dnf copr enable``::
+
+    copr_repos: []
+
+    # An example:
+    copr_repos:
+      - ktdreyer/ceph-el8
+
 A list defining apt repos that would be common across a major version or distro. Each item in the list represents
 an apt repo to be added to sources.list::
 
diff --git a/roles/testnode/defaults/main.yml b/roles/testnode/defaults/main.yml
index f4c61fe..837f959 100644
--- a/roles/testnode/defaults/main.yml
+++ b/roles/testnode/defaults/main.yml
@@ -11,6 +11,9 @@ common_yum_repos: {}
 # version-specific yum repos, defined in the version specific var file
 yum_repos: {}
 
+# list of copr repo *names* to enable (e.g., user/repo)
+copr_repos: []
+
 # apt repos common to a major version or distro
 common_apt_repos: []
 
diff --git a/roles/testnode/tasks/yum/repos.yml b/roles/testnode/tasks/yum/repos.yml
index 9ca8b3c..2af361e 100644
--- a/roles/testnode/tasks/yum/repos.yml
+++ b/roles/testnode/tasks/yum/repos.yml
@@ -21,6 +21,13 @@
   with_dict: "{{ yum_repos }}"
   when: yum_repos.keys() | length > 0
 
+- name: Enable copr repos
+  command: "dnf -y copr enable {{ item }}"
+  with_items: "{{ copr_repos }}"
+  when:
+    - (ansible_os_family == "RedHat" and ansible_distribution_major_version|int >= 8)
+    - copr_repos|length > 0
+
 - import_tasks: gpg_keys.yml
   when: ansible_distribution == "Fedora"
   tags:
diff --git a/roles/testnode/vars/centos_8.yml b/roles/testnode/vars/centos_8.yml
index dd2ec74..d91985c 100644
--- a/roles/testnode/vars/centos_8.yml
+++ b/roles/testnode/vars/centos_8.yml
@@ -1,5 +1,5 @@
 ---
-# vars specific to any rhel 8.x version
+# vars specific to any centos 8.x version
 
 common_yum_repos:
   lab-extras:
@@ -8,6 +8,9 @@ common_yum_repos:
     enabled: 1
     gpgcheck: 0
 
+copr_repos:
+  - ktdreyer/ceph-el8
+
 packages:
   - '@core'
   - '@base'
diff --git a/roles/testnode/vars/redhat_8.yml b/roles/testnode/vars/redhat_8.yml
index 082acfa..3236d6a 100644
--- a/roles/testnode/vars/redhat_8.yml
+++ b/roles/testnode/vars/redhat_8.yml
@@ -8,6 +8,9 @@ common_yum_repos:
     enabled: 1
     gpgcheck: 0
 
+copr_repos:
+  - ktdreyer/ceph-el8
+
 packages:
   - '@core'
   - '@base'