From 15f2c5339ca9a327489793be6281cf537514dc53 Mon Sep 17 00:00:00 2001
From: Martin Chlumsky <martin.chlumsky@ubisoft.com>
Date: Sun, 15 Nov 2020 22:11:41 -0500
Subject: [PATCH] Fix missing cronie package in RHEL-based image builds

In RHEL-based distros, cron is provided by the cronie package. This package is
missing from the amphora built images.

This patch maps the cron package to cronie for distros in the Red Hat family.

Change-Id: I6fb7889de90e8e5354c1e6ce2c95ec0199ce90e3
Story: 2008351
Task: 41253
(cherry picked from commit 6aa23358eb2f4df412e010fd1fbb9e35ee2e1522)
---
 elements/amphora-agent/pkg-map                                | 2 +-
 .../notes/fix-missing-cronie-rh-bd31001338ddbb1e.yaml         | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/fix-missing-cronie-rh-bd31001338ddbb1e.yaml

diff --git a/elements/amphora-agent/pkg-map b/elements/amphora-agent/pkg-map
index e743b2eb35..54a8fb38a8 100644
--- a/elements/amphora-agent/pkg-map
+++ b/elements/amphora-agent/pkg-map
@@ -4,7 +4,7 @@
       "amphora-agent": "openstack-octavia-amphora-agent",
       "netcat-openbsd": "nmap-ncat",
       "netbase": "",
-      "cron": "",
+      "cron": "cronie",
       "ifenslave": "",
       "iputils-tracepath": "",
       "cloud-guest-utils": "",
diff --git a/releasenotes/notes/fix-missing-cronie-rh-bd31001338ddbb1e.yaml b/releasenotes/notes/fix-missing-cronie-rh-bd31001338ddbb1e.yaml
new file mode 100644
index 0000000000..698f21b924
--- /dev/null
+++ b/releasenotes/notes/fix-missing-cronie-rh-bd31001338ddbb1e.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Add missing cronie RPM to Red Hat based amphora images.