openstack
/
octavia
Code Issues Proposed changes

Merge "Make disk image buildable for fedora"

This commit is contained in:
Zuul 2018-12-08 14:52:21 +00:00 committed by Gerrit Code Review
parent ef90f0ed9d a587614756
commit 75c1d7c1ab
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage-create/diskimage-create.sh
View File

@ -208,7 +208,7 @@ AMP_PACKAGE_INSTALL=${AMP_PACKAGE_INSTALL:-0}
AMP_ENABLE_FULL_MAC_SECURITY=${AMP_ENABLE_FULL_MAC_SECURITY:-0}
if [ "$AMP_BASEOS" = "rhel" -o "$AMP_BASEOS" = "centos" ] && [ "$AMP_IMAGESIZE" -lt 3 ]; then
if [ "$AMP_BASEOS" = "rhel" -o "$AMP_BASEOS" = "centos" -o "$AMP_BASEOS" = "fedora" ] && [ "$AMP_IMAGESIZE" -lt 3 ]; then
echo "RHEL/centos based amphora requires an image size of at least 3GB"
exit 1
fi

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

@ -2,7 +2,22 @@
"family": {
"redhat": {
"amphora-agent": "openstack-octavia-amphora-agent",
"netcat-openbsd": "nmap-ncat"
"netcat-openbsd": "nmap-ncat",
"netbase": "",
"cron": "",
"ifenslave": "",
"iputils-tracepath": "",
"cloud-guest-utils": "",
"apparmor": "",
"dmeventd": "",
"isc-dhcp-client": "",
"uuid-runtime": "",
"ubuntu-cloudimage-keyring": "",
"vim-tiny": "",
"ureadahead": "",
"apt-transport-https": "",
"pollinate": "",
"ifupdown": ""
}
},
"default": {