openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Fix installation of proliant tools"

This commit is contained in:
Zuul 2021-03-08 23:47:32 +00:00 committed by Gerrit Code Review
parent 8b0e2417a6 5efb11de0d
commit 4c5b1179f3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
diskimage_builder/elements/proliant-tools/install.d/65-proliant-tools-install
View File

@ -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

3
diskimage_builder/elements/proliant-tools/package-installs.yaml
View File

@ -3,3 +3,6 @@ gcc:
python-dev:
unzip:
net-tools:
binutils:
pciutils:
tar: