From 5e9ce316b7152ec247399e1257b152914bf8450c Mon Sep 17 00:00:00 2001
From: Doug Goldstein <cardoe@cardoe.com>
Date: Wed, 13 Nov 2024 13:26:03 -0600
Subject: [PATCH] ironic: fix reading of the correct path to ironic.conf

The path to the ironic.conf was wrong in the start up script which
resulted in the tempdir not being read at all.

Change-Id: Ic1efefc34721a6b669580287f68d7b73c1c61fac
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
 ironic/Chart.yaml                                  | 2 +-
 ironic/templates/bin/_ironic-conductor-init.sh.tpl | 2 +-
 releasenotes/notes/ironic.yaml                     | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ironic/Chart.yaml b/ironic/Chart.yaml
index 02b37605aa..90c188cff8 100644
--- a/ironic/Chart.yaml
+++ b/ironic/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ironic
 name: ironic
-version: 0.2.20
+version: 0.2.21
 home: https://docs.openstack.org/ironic/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Ironic/OpenStack_Project_Ironic_vertical.png
 sources:
diff --git a/ironic/templates/bin/_ironic-conductor-init.sh.tpl b/ironic/templates/bin/_ironic-conductor-init.sh.tpl
index 54b5ad96a0..dbec2a0864 100644
--- a/ironic/templates/bin/_ironic-conductor-init.sh.tpl
+++ b/ironic/templates/bin/_ironic-conductor-init.sh.tpl
@@ -35,7 +35,7 @@ if [ "x" == "x${PXE_IP}" ]; then
 fi
 
 # ensure the tempdir exists, read it from the config
-ironictmpdir=$(python -c 'from configparser import ConfigParser;cfg = ConfigParser();cfg.read("ironic.conf");print(cfg.get("DEFAULT", "tempdir", fallback=""))')
+ironictmpdir=$(python -c 'from configparser import ConfigParser;cfg = ConfigParser();cfg.read("/etc/ironic/ironic.conf");print(cfg.get("DEFAULT", "tempdir", fallback=""))')
 if [ -n "${ironictmpdir}" -a ! -d "${ironictmpdir}" ]; then
   mkdir -p "${ironictmpdir}"
   chmod 1777 "${ironictmpdir}"
diff --git a/releasenotes/notes/ironic.yaml b/releasenotes/notes/ironic.yaml
index dc3679ffdc..591e3a6ca2 100644
--- a/releasenotes/notes/ironic.yaml
+++ b/releasenotes/notes/ironic.yaml
@@ -24,4 +24,5 @@ ironic:
   - 0.2.18 Use service tokens
   - 0.2.19 Allow extra containers for the conductor
   - 0.2.20 ensure tempdir is set to a reasonable default
+  - 0.2.21 fix path to ironic.conf for 0.2.20's tempdir setting
 ...