From 15b7b6ce5d244d876b78b84677d10448bd86825a Mon Sep 17 00:00:00 2001
From: yatinkarel <ykarel@redhat.com>
Date: Fri, 15 May 2020 15:18:48 +0530
Subject: [PATCH] Install atop in CentOS8 from RDO CentOS8 repo

Currently atop in CentOS8 jobs is installed from
Epel 7 repo which is wrong. Since atop is available
in RDO build deps repo let's use that when running
on CentOS8[1].

Also seen kernel panic related to atop as described
in related bug.

[1] https://review.rdoproject.org/r/#/q/topic:rdo-centos8-remove-epel

Related-Bug: #1866202
Change-Id: I4f605615fb1bdc720194244cb43be14648033271
---
 roles/undercloud-setup/tasks/atop.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/roles/undercloud-setup/tasks/atop.yml b/roles/undercloud-setup/tasks/atop.yml
index af52cddbb..1da630a41 100644
--- a/roles/undercloud-setup/tasks/atop.yml
+++ b/roles/undercloud-setup/tasks/atop.yml
@@ -4,13 +4,24 @@
   become: true
   block:
     # Run atop in background
-    - name: Install atop if configured so
+    - name: Install atop from epel repo when configured so (CentOS < 8)
       shell: |
         if [ -e /etc/ci/mirror_info.sh ]; then
           source /etc/ci/mirror_info.sh
         fi
         atop_location=$(repoquery --repoid=osepel --repofrompath=osepel,$NODEPOOL_EPEL_MIRROR/7/x86_64/ --location atop)
         {{ ansible_pkg_mgr }} install -y $atop_location
+      when:
+        - ansible_distribution == 'CentOS'
+        - ansible_distribution_major_version is version(8, '<')
+
+    - name: Install atop from RDO build-deps repo when configured so (CentOS >= 8)
+      package:
+        name: "atop"
+        state: present
+      when:
+        - ansible_distribution == 'CentOS'
+        - ansible_distribution_major_version is version(8, '>=')
 
     - name: Run atop
       shell: "{{ atop_command }} &"