From 50c168e860b0947b33109dd4d94beea44400f671 Mon Sep 17 00:00:00 2001
From: Gregory Thiemonge <gthiemon@redhat.com>
Date: Thu, 1 Aug 2019 16:57:57 +0200
Subject: [PATCH] Fix wrong package names or versions for centos-minimal images

Since centos-minimal is used as base for centos image, dib installs
haproxy 1.5.x instead of haproxy 1.8.x, and dhcp client is missing
(dhclient package).

Depends-On: https://review.opendev.org/#/c/673172/

Story: 2006323
Task: 36056

Change-Id: I3be0fa18578c7c1552f24842a09e18c01e34358a
---
 elements/amphora-agent/pkg-map                      | 3 ++-
 elements/haproxy-octavia/pkg-map                    | 8 +++++---
 elements/haproxy-octavia/pre-install.d/01-backports | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/elements/amphora-agent/pkg-map b/elements/amphora-agent/pkg-map
index bd7d314df2..59d7fe64c6 100644
--- a/elements/amphora-agent/pkg-map
+++ b/elements/amphora-agent/pkg-map
@@ -2,6 +2,7 @@
   "release": {
     "rhel": {
       "8": {
+        "isc-dhcp-client": "dhcp-client",
         "python-dev": "platform-python-devel",
         "vlan": "",
         "screen": "",
@@ -20,7 +21,7 @@
       "cloud-guest-utils": "",
       "apparmor": "",
       "dmeventd": "",
-      "isc-dhcp-client": "dhcp-client",
+      "isc-dhcp-client": "dhclient",
       "uuid-runtime": "",
       "ubuntu-cloudimage-keyring": "",
       "vim-tiny": "",
diff --git a/elements/haproxy-octavia/pkg-map b/elements/haproxy-octavia/pkg-map
index 539126f48c..cc82cdbfc9 100644
--- a/elements/haproxy-octavia/pkg-map
+++ b/elements/haproxy-octavia/pkg-map
@@ -4,14 +4,16 @@
             "trusty": {
                 "haproxy": "haproxy/trusty-backports"
             }
+        },
+        "centos": {
+            "7": {
+                "haproxy": "haproxy18"
+            }
         }
     },
     "distro": {
         "ubuntu": {
             "haproxy": "haproxy"
-        },
-        "centos7": {
-            "haproxy": "haproxy18"
         }
     },
     "family": {
diff --git a/elements/haproxy-octavia/pre-install.d/01-backports b/elements/haproxy-octavia/pre-install.d/01-backports
index 4cd4bbb5ea..7c2db67408 100755
--- a/elements/haproxy-octavia/pre-install.d/01-backports
+++ b/elements/haproxy-octavia/pre-install.d/01-backports
@@ -6,7 +6,7 @@ set -o xtrace
 
 if [ "$DISTRO_NAME" == "ubuntu" ] && [ "$DIB_RELEASE" == "trusty" ]; then
     echo deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse > /etc/apt/sources.list.d/backports.list
-elif [ "$DISTRO_NAME" == "centos7" ]; then
+elif [ "$DISTRO_NAME" == "centos" ] && [ "$DIB_RELEASE" == "7" ]; then
     INCLUDEPKGS=''
     case $ARCH in
     x86_64|amd64)