From: David Galloway <dgallowa@redhat.com>
Date: Fri, 15 Oct 2021 17:35:43 +0000 (-0400)
Subject: testnode: Add Apache Arrow repo
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F654%2Fhead;p=ceph-cm-ansible.git

testnode: Add Apache Arrow repo

Some changes to Rados GW will require some dependencies in this repo.  See https://github.com/ceph/ceph/pull/40802

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

diff --git a/roles/testnode/tasks/yum/gpg_keys.yml b/roles/testnode/tasks/yum/gpg_keys.yml
index 5c216c98..4455932f 100644
--- a/roles/testnode/tasks/yum/gpg_keys.yml
+++ b/roles/testnode/tasks/yum/gpg_keys.yml
@@ -15,4 +15,5 @@
   with_items:
     - 'https://{{ key_host }}/keys/release.asc'
     - 'https://{{ key_host }}/keys/autobuild.asc'
+    - 'https://dist.apache.org/repos/dist/dev/arrow/KEYS'
   register: gpg_keys
diff --git a/roles/testnode/tasks/yum/repos.yml b/roles/testnode/tasks/yum/repos.yml
index 278d8d7f..da9877e8 100644
--- a/roles/testnode/tasks/yum/repos.yml
+++ b/roles/testnode/tasks/yum/repos.yml
@@ -39,7 +39,6 @@
     - copr_repos|length > 0
 
 - import_tasks: gpg_keys.yml
-  when: ansible_distribution == "Fedora"
   tags:
     - gpg-keys
 
diff --git a/roles/testnode/vars/centos_7.yml b/roles/testnode/vars/centos_7.yml
index e88310ca..dd4deaa8 100644
--- a/roles/testnode/vars/centos_7.yml
+++ b/roles/testnode/vars/centos_7.yml
@@ -12,6 +12,11 @@ yum_repos:
     baseurl: "http://{{ mirror_host }}/lab-extras/centos7/"
     enabled: 1
     gpgcheck: 0
+  apache-arrow:
+    name: "Apache Arrow"
+    baseurl: "https://apache.jfrog.io/artifactory/arrow/centos/7/$basearch"
+    enabled: 1
+    gpgcheck: 1
 
 packages:
   - '@core'
diff --git a/roles/testnode/vars/centos_8.yml b/roles/testnode/vars/centos_8.yml
index f3cca0ec..38fbf778 100644
--- a/roles/testnode/vars/centos_8.yml
+++ b/roles/testnode/vars/centos_8.yml
@@ -7,6 +7,11 @@ common_yum_repos:
     baseurl: "http://{{ mirror_host }}/lab-extras/8/"
     enabled: 1
     gpgcheck: 0
+  apache-arrow:
+    name: "Apache Arrow"
+    baseurl: "https://apache.jfrog.io/artifactory/arrow/centos/8/$basearch"
+    enabled: 1
+    gpgcheck: 1
 
 # These will overwrite the repo files that come with a CentOS installation
 yum_repos:
diff --git a/roles/testnode/vars/redhat_7.yml b/roles/testnode/vars/redhat_7.yml
index 77741bd9..a47771f1 100644
--- a/roles/testnode/vars/redhat_7.yml
+++ b/roles/testnode/vars/redhat_7.yml
@@ -12,6 +12,11 @@ common_yum_repos:
     baseurl: "http://{{ mirror_host }}/lab-extras/rhel7/"
     enabled: 1
     gpgcheck: 0
+  apache-arrow:
+    name: "Apache Arrow"
+    baseurl: "https://apache.jfrog.io/artifactory/arrow/centos/7/$basearch"
+    enabled: 1
+    gpgcheck: 1
 
 packages:
   - '@core'
diff --git a/roles/testnode/vars/redhat_8.yml b/roles/testnode/vars/redhat_8.yml
index b56784fc..7b79c328 100644
--- a/roles/testnode/vars/redhat_8.yml
+++ b/roles/testnode/vars/redhat_8.yml
@@ -7,6 +7,11 @@ common_yum_repos:
     baseurl: "http://{{ mirror_host }}/lab-extras/8/"
     enabled: 1
     gpgcheck: 0
+  apache-arrow:
+    name: "Apache Arrow"
+    baseurl: "https://apache.jfrog.io/artifactory/arrow/centos/8/$basearch"
+    enabled: 1
+    gpgcheck: 1
 
 copr_repos:
   - ceph/python3-asyncssh