From 5c91a6c60e566927b1dd5ef8247e6a8bd39b91f3 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Tue, 12 Aug 2025 11:00:15 +0100 Subject: [PATCH 1/3] Make repo configurable --- .../install.d/62-stackhpc-hardware-managers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elements/stackhpc-ipa-hardware-managers/install.d/62-stackhpc-hardware-managers b/elements/stackhpc-ipa-hardware-managers/install.d/62-stackhpc-hardware-managers index 96be6bd..cdad03c 100755 --- a/elements/stackhpc-ipa-hardware-managers/install.d/62-stackhpc-hardware-managers +++ b/elements/stackhpc-ipa-hardware-managers/install.d/62-stackhpc-hardware-managers @@ -8,4 +8,4 @@ set -o pipefail IPA_VENV=/usr/share/ironic-python-agent/venv -$IPA_VENV/bin/pip install git+https://github.com/stackhpc/stackhpc-ipa-hardware-managers.git@${DIB_IPA_STACKHPC_IPA_HARDWARE_MANAGERS_BRANCH:-master} +$IPA_VENV/bin/pip install ${DIB_IPA_STACKHPC_IPA_HARDWARE_MANAGERS_REPO:-git+https://github.com/stackhpc/stackhpc-ipa-hardware-managers.git}@${DIB_IPA_STACKHPC_IPA_HARDWARE_MANAGERS_BRANCH:-master} From 108295ccae6a8d8627a84f45677d2e7456a9729b Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Tue, 12 Aug 2025 11:00:47 +0100 Subject: [PATCH 2/3] Remove python-virtualenv dependency 2025-08-12 09:49:51.561 | > - nothing provides python3-setuptools-wheel needed by python3-virtualenv-20.31.2-2.el10_1.noarch from epel 2025-08-12 09:49:51.561 | > - nothing provides python3-wheel-wheel needed by python3-virtualenv-20.31.2-2.el10_1.noarch from epel --- elements/stackhpc-ipa-hardware-managers/element-deps | 1 - 1 file changed, 1 deletion(-) diff --git a/elements/stackhpc-ipa-hardware-managers/element-deps b/elements/stackhpc-ipa-hardware-managers/element-deps index ecaa871..73d637d 100644 --- a/elements/stackhpc-ipa-hardware-managers/element-deps +++ b/elements/stackhpc-ipa-hardware-managers/element-deps @@ -1,3 +1,2 @@ package-installs -pip-and-virtualenv source-repositories From f77cf8a0171ff37c1235a99a18e906a959cb2508 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Tue, 12 Aug 2025 11:13:03 +0100 Subject: [PATCH 3/3] Update Ironic Python Agent venv location --- .../install.d/62-stackhpc-hardware-managers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elements/stackhpc-ipa-hardware-managers/install.d/62-stackhpc-hardware-managers b/elements/stackhpc-ipa-hardware-managers/install.d/62-stackhpc-hardware-managers index cdad03c..71295d5 100755 --- a/elements/stackhpc-ipa-hardware-managers/install.d/62-stackhpc-hardware-managers +++ b/elements/stackhpc-ipa-hardware-managers/install.d/62-stackhpc-hardware-managers @@ -6,6 +6,6 @@ fi set -eu set -o pipefail -IPA_VENV=/usr/share/ironic-python-agent/venv +IPA_VENV=/opt/ironic-python-agent $IPA_VENV/bin/pip install ${DIB_IPA_STACKHPC_IPA_HARDWARE_MANAGERS_REPO:-git+https://github.com/stackhpc/stackhpc-ipa-hardware-managers.git}@${DIB_IPA_STACKHPC_IPA_HARDWARE_MANAGERS_BRANCH:-master}