From 52db46be932971601515ae6a51e7ab19e3a7afce Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 13 Mar 2026 11:41:16 -0400 Subject: [PATCH 1/3] Fix python detection from ansible with space in shebang --- confluent_server/confluent/runansible.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/confluent_server/confluent/runansible.py b/confluent_server/confluent/runansible.py index 730ff15a..eeb766e1 100644 --- a/confluent_server/confluent/runansible.py +++ b/confluent_server/confluent/runansible.py @@ -97,7 +97,7 @@ class PlayRunner(object): if ansloc: with open(ansloc, 'r') as onsop: shebang = onsop.readline() - anspypath = shebang.strip().replace('#!', '') + anspypath = shebang.strip().replace('#!', '').strip() mypath = anspypath if not mypath: mypath = sys.executable From 13a6444541ca10e97cf149bf0dd471b67abd91b7 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 17 Mar 2026 12:58:04 -0400 Subject: [PATCH 2/3] Fix incorrectly matching older versions as 'el10' --- confluent_osdeploy/el8/profiles/default/initprofile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/confluent_osdeploy/el8/profiles/default/initprofile.sh b/confluent_osdeploy/el8/profiles/default/initprofile.sh index 8a25fe6e..911a50af 100644 --- a/confluent_osdeploy/el8/profiles/default/initprofile.sh +++ b/confluent_osdeploy/el8/profiles/default/initprofile.sh @@ -3,7 +3,7 @@ sed -i 's/centos/CentOS/; s/rhel/Red Hat Enterprise Linux/; s/oraclelinux/Oracle if grep Fedora $2/profile.yaml > /dev/null; then sed -i 's/@^minimal-environment/#/' $2/packagelist fi -if grep ^label: $2/profile.yaml | grep 10 > /dev/null; then +if grep ^label: $2/profile.yaml | grep ' 10' > /dev/null; then echo 'echo openssh-keysign >> /tmp/addonpackages' > $2/scripts/pre.d/enablekeysign chmod 644 $2/scripts/pre.d/enablekeysign fi From 9b00fe5521c39c5bf29c634b36243b45a9b158fb Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 17 Mar 2026 13:03:18 -0400 Subject: [PATCH 3/3] Don't try to open a file that doesn't exist --- .../el9-diskless/profiles/default/scripts/image2disk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/confluent_osdeploy/el9-diskless/profiles/default/scripts/image2disk.py b/confluent_osdeploy/el9-diskless/profiles/default/scripts/image2disk.py index 315c0827..67906ba0 100644 --- a/confluent_osdeploy/el9-diskless/profiles/default/scripts/image2disk.py +++ b/confluent_osdeploy/el9-diskless/profiles/default/scripts/image2disk.py @@ -467,7 +467,7 @@ def install_to_disk(imgpath): subprocess.check_call(['pvcreate', '-ff', '-y', lvmpart]) subprocess.check_call(['vgcreate', vgname, lvmpart]) vgroupmap = {} - if yaml and vgmap: + if yaml and vgmap and os.path.exists('/tmp/volumegroupmap.yml'): with open('/tmp/volumegroupmap.yml') as mapin: vgroupmap = yaml.safe_load(mapin) donedisks = {}