From 81ed1334d2d4232698a69db4c9a31d392b1e950a Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Mon, 23 Mar 2020 09:25:24 -0700
Subject: [PATCH] Exclude acpid on Red Hat family DIB builds

Red Hat/centos do not ship acpid for ppc64le, but others do.
This patch sets up a package map for DIB to exclude the acpid
package on Red Hat family image builds, while allowing it for the
other distros.

Change-Id: Iaef520e5f2a66833228e824ec4fb41f5915169af
---
 elements/amphora-agent/package-installs.yaml | 5 +++++
 elements/amphora-agent/pkg-map               | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/elements/amphora-agent/package-installs.yaml b/elements/amphora-agent/package-installs.yaml
index 11a1f4b5c5..c312035ddb 100644
--- a/elements/amphora-agent/package-installs.yaml
+++ b/elements/amphora-agent/package-installs.yaml
@@ -10,7 +10,12 @@ python-dev:
   installtype: source
 
 acl:
+# Note: Red Hat family does not currently ship acpid for ppc64le.
+# This sets up a pkg-map to exclude it for Red Hat family ppc64le arch
+acpid-ppc64le:
+  arch: ppc64le, ppc64el
 acpid:
+  arch: i386, amd64, arm64, s390x
 apparmor:
 apt-transport-https:
 at:
diff --git a/elements/amphora-agent/pkg-map b/elements/amphora-agent/pkg-map
index 0f525163e6..f58bd7e126 100644
--- a/elements/amphora-agent/pkg-map
+++ b/elements/amphora-agent/pkg-map
@@ -22,6 +22,7 @@
   "family": {
     "redhat": {
       "amphora-agent": "openstack-octavia-amphora-agent",
+      "acpid-ppc64le": "",
       "netcat-openbsd": "nmap-ncat",
       "netbase": "",
       "cron": "",
@@ -43,6 +44,7 @@
   },
   "default": {
     "amphora-agent": "amphora-agent",
+    "acpid-ppc64le": "acpid",
     "network-scripts": ""
   }
 }