From 5efb11de0d3bb6219f841d6bf05d9ad9395f4c5e Mon Sep 17 00:00:00 2001
From: Francois RIGAULT <rigault.francois@gmail.com>
Date: Wed, 3 Mar 2021 18:59:01 +0100
Subject: [PATCH] Fix installation of proliant tools

Use the actual virtualenv to install proliant tools, and make sure the
dependencies needed for sum firmware upgrade are included.

Change-Id: Ie1dbb868450918567b2903cdeccda35af1904417
Closes-Bug: #1916346
---
 .../proliant-tools/install.d/65-proliant-tools-install       | 5 +++--
 .../elements/proliant-tools/package-installs.yaml            | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/diskimage_builder/elements/proliant-tools/install.d/65-proliant-tools-install b/diskimage_builder/elements/proliant-tools/install.d/65-proliant-tools-install
index 161a870f7..a9922b2b6 100755
--- a/diskimage_builder/elements/proliant-tools/install.d/65-proliant-tools-install
+++ b/diskimage_builder/elements/proliant-tools/install.d/65-proliant-tools-install
@@ -34,6 +34,7 @@ if [[ $DISTRO_NAME = "ubuntu" || $DISTRO_NAME = "debian" ]]; then
     alien -i /tmp/ssacli.rpm
 else
     rpm -iv /tmp/ssacli.rpm
+    rpm --import https://downloads.linux.hpe.com/SDR/hpePublicKey2048_key1.pub
 fi
 
 rm -f /tmp/ssacli.rpm
@@ -41,8 +42,8 @@ rm -f /tmp/ssacli.rpm
 # Install proliantutils python module in the
 # virtual environment of ironic-python-agent.
 # This is pre-installed by
-# ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install.
-IPA_VENV=/usr/share/ironic-python-agent/venv
+# ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/60-ironic-python-agent-ramdisk-install.
+IPA_VENV=/opt/ironic-python-agent
 if [[ -d "$IPA_VENV" ]]; then
     $IPA_VENV/bin/pip install proliantutils
 else
diff --git a/diskimage_builder/elements/proliant-tools/package-installs.yaml b/diskimage_builder/elements/proliant-tools/package-installs.yaml
index 3cb16a329..9bee558ea 100644
--- a/diskimage_builder/elements/proliant-tools/package-installs.yaml
+++ b/diskimage_builder/elements/proliant-tools/package-installs.yaml
@@ -3,3 +3,6 @@ gcc:
 python-dev:
 unzip:
 net-tools:
+binutils:
+pciutils:
+tar: