openstack/ironic-python-agent-builder
Code Issues Proposed changes

Don't fail early if no config drive found

Browse Source 
The use of pipefail means that we fail early if we don't
find a matching config drive. This is because grep returns
exit code 1 if no match is found. We can either drop the
pipefail setting, or force grep to return 0. This allows us
to exit gracefully later in the script with code 0.

Closes-Bug: #2120574
Change-Id: I84e348b44b041672ded800a967dae18437f16bba
Signed-off-by: Doug Szumski <doug@stackhpc.com>
This commit is contained in:
Doug Szumski
2025-08-13 16:05:40 +01:00
parent e9e5b020a5
commit 9b397bd34e
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dib/ironic-python-agent-ramdisk/static/usr/local/bin/ironic-python-agent-resolve-configdrive.sh
View File

@@ -15,7 +15,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
CONFIG_DRIVE_LABEL="config-2" CONFIG_DRIVE_LABEL="config-2"
# Identify the number of devices # Identify the number of devices
device_count=$(lsblk -o PATH,LABEL | grep $CONFIG_DRIVE_LABEL | wc -l) device_count=$(lsblk -o PATH,LABEL | grep -c $CONFIG_DRIVE_LABEL || true)
# Identify if we have an a publisher id set # Identify if we have an a publisher id set
publisher_id="" publisher_id=""

5
releasenotes/notes/fix-early-fail-if-no-config-drive-2085609b044ac85f.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
fixes:
- |
Fixes a minor issue where the resolve config drive script fails early if
no config drive is found.