From 2ec51ff8bd63247dc5f1c380cdacf5e8e8f869e3 Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Thu, 24 Sep 2020 10:10:02 +0200
Subject: [PATCH] Use the new IPA-builder element for installing
 python-hardware

Also use quotes for DIB_EPEL_DISABLED as without that it fails
in python2, in ussuri+ releases it's not needed as those are
python3 only.


Change-Id: Id75c11e5b7c4f3bf73c962bc7e46f5a6021efc5f
Depends-On: https://review.opendev.org/#/c/753966/
(cherry picked from commit be437cb1e341c437ddd8d6901ce107982bb808df)
---
 image-yaml/overcloud-images.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/image-yaml/overcloud-images.yaml b/image-yaml/overcloud-images.yaml
index a5c394ab7..78d4ab03f 100644
--- a/image-yaml/overcloud-images.yaml
+++ b/image-yaml/overcloud-images.yaml
@@ -51,9 +51,9 @@ disk_images:
       - network-gateway
       - enable-packages-install
       - override-pip-and-virtualenv
-    packages:
-      - python-hardware-detect
+      - extra-hardware
     options:
       - "--min-tmpfs=7"
     environment:
+      DIB_EPEL_DISABLED: '1'
       DIB_PYTHON_VERSION: '2'