Merge "Make disk image buildable for fedora"

openstack · Dec 8, 2018 · 75c1d7c · 75c1d7c
2 parents ef90f0e + a587614
commit 75c1d7c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh
@@ -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

diff --git 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": {