From 7d77f4fab2b2f21e46894a2a56718c49d6006c2b Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 21 Feb 2022 11:32:53 -0800
Subject: [PATCH] Add rocky support to the epel element

OpenDev relies on the epel role to configure the epel repository for our
image builds. Specifically we need epel to pull in haveged. Update the
epel role to recognize rocky and configure it properly.

Change-Id: I968d4702ef39590e972b782a09e18a5db40703ad
---
 diskimage_builder/elements/epel/pkg-map                       | 4 ++++
 .../elements/epel/pre-install.d/05-rpm-epel-release           | 2 +-
 .../rocky-container/test-elements/build-succeeds/element-deps | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/diskimage_builder/elements/epel/pkg-map b/diskimage_builder/elements/epel/pkg-map
index 4cdc3fdf8..d5ff8db01 100644
--- a/diskimage_builder/elements/epel/pkg-map
+++ b/diskimage_builder/elements/epel/pkg-map
@@ -11,6 +11,10 @@
     "rhel7": {
        "wget": "wget",
        "yum-utils": "yum-utils"
+    },
+    "rocky": {
+       "wget": "wget",
+       "yum-utils": "yum-utils"
     }
  },
  "default": {
diff --git a/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release b/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release
index 1d3816a9f..3a5c6546e 100755
--- a/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release
+++ b/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release
@@ -6,7 +6,7 @@ fi
 set -eu
 set -o pipefail
 
-if [[ ${DISTRO_NAME} =~ "centos" && "${DIB_RELEASE%-stream}" -lt '9' ]]; then
+if [[ (${DISTRO_NAME} =~ "centos" || ${DISTRO_NAME} =~ "rocky") && "${DIB_RELEASE%-stream}" -lt '9' ]]; then
     # Centos has "epel-release" in extras, which is default enabled.
     ${YUM} install -y epel-release
 else
diff --git a/diskimage_builder/elements/rocky-container/test-elements/build-succeeds/element-deps b/diskimage_builder/elements/rocky-container/test-elements/build-succeeds/element-deps
index 4be9e9fea..73b3d4e12 100644
--- a/diskimage_builder/elements/rocky-container/test-elements/build-succeeds/element-deps
+++ b/diskimage_builder/elements/rocky-container/test-elements/build-succeeds/element-deps
@@ -1,2 +1 @@
-openstack-ci-mirrors
 vm