Make disk image buildable for fedora
1. Enforce amphora image size >= 3G 2. Exclude debs required by ubuntu minimal for redhat Change-Id: I343eaf19d4bd595d5b10dc330e53d41ceccc560a
This commit is contained in:
parent
7fa83ef8e6
commit
a587614756
|
@ -200,7 +200,7 @@ AMP_PACKAGE_INSTALL=${AMP_PACKAGE_INSTALL:-0}
|
||||||
|
|
||||||
AMP_ENABLE_FULL_MAC_SECURITY=${AMP_ENABLE_FULL_MAC_SECURITY:-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"
|
echo "RHEL/centos based amphora requires an image size of at least 3GB"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -2,7 +2,22 @@
|
||||||
"family": {
|
"family": {
|
||||||
"redhat": {
|
"redhat": {
|
||||||
"amphora-agent": "openstack-octavia-amphora-agent",
|
"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": {
|
"default": {
|
||||||
|
|
Loading…
Reference in New Issue