From a5876147565c112eab9427603fd68943cd8f807a Mon Sep 17 00:00:00 2001
From: Jacky Hu <hudayou@hotmail.com>
Date: Sat, 29 Sep 2018 20:51:19 +0800
Subject: [PATCH] Make disk image buildable for fedora

1. Enforce amphora image size >= 3G
2. Exclude debs required by ubuntu minimal for redhat

Change-Id: I343eaf19d4bd595d5b10dc330e53d41ceccc560a
---
 diskimage-create/diskimage-create.sh |  2 +-
 elements/amphora-agent/pkg-map       | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh
index cde50a0c9c..b21f8ae134 100755
--- a/diskimage-create/diskimage-create.sh
+++ b/diskimage-create/diskimage-create.sh
@@ -200,7 +200,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
diff --git a/elements/amphora-agent/pkg-map b/elements/amphora-agent/pkg-map
index 53d4ef66ff..e743b2eb35 100644
--- a/elements/amphora-agent/pkg-map
+++ b/elements/amphora-agent/pkg-map
@@ -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": {