openstack/octavia
Code Issues Proposed changes

Exclude acpid on Red Hat family DIB builds

Browse Source 
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
This commit is contained in:
Michael Johnson 2020-03-23 09:25:24 -07:00
parent 2cf00d8c85
commit 81ed1334d2
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
elements/amphora-agent/package-installs.yaml
View File

@ -10,7 +10,12 @@ python-dev:
installtype: source installtype: source
acl: 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: acpid:
arch: i386, amd64, arm64, s390x
apparmor: apparmor:
apt-transport-https: apt-transport-https:
at: at:

2
elements/amphora-agent/pkg-map
View File

@ -22,6 +22,7 @@
"family": { "family": {
"redhat": { "redhat": {
"amphora-agent": "openstack-octavia-amphora-agent", "amphora-agent": "openstack-octavia-amphora-agent",
"acpid-ppc64le": "",
"netcat-openbsd": "nmap-ncat", "netcat-openbsd": "nmap-ncat",
"netbase": "", "netbase": "",
"cron": "", "cron": "",
@ -43,6 +44,7 @@
}, },
"default": { "default": {
"amphora-agent": "amphora-agent", "amphora-agent": "amphora-agent",
"acpid-ppc64le": "acpid",
"network-scripts": "" "network-scripts": ""
} }
} }