sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix installation of proliant tools

Browse Source 
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
This commit is contained in:
Francois RIGAULT 2021-03-03 18:59:01 +01:00
parent 5c1f9a3238
commit 5efb11de0d
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 alien -i /tmp/ssacli.rpm
else else
rpm -iv /tmp/ssacli.rpm rpm -iv /tmp/ssacli.rpm
rpm --import https://downloads.linux.hpe.com/SDR/hpePublicKey2048_key1.pub
fi fi
rm -f /tmp/ssacli.rpm rm -f /tmp/ssacli.rpm
@ -41,8 +42,8 @@ rm -f /tmp/ssacli.rpm
# Install proliantutils python module in the # Install proliantutils python module in the
# virtual environment of ironic-python-agent. # virtual environment of ironic-python-agent.
# This is pre-installed by # This is pre-installed by
# ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install. # ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/60-ironic-python-agent-ramdisk-install.
IPA_VENV=/usr/share/ironic-python-agent/venv IPA_VENV=/opt/ironic-python-agent
if [[ -d "$IPA_VENV" ]]; then if [[ -d "$IPA_VENV" ]]; then
$IPA_VENV/bin/pip install proliantutils $IPA_VENV/bin/pip install proliantutils
else else

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

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