openstack/openstack-helm
Code Issues Proposed changes

ironic: fix reading of the correct path to ironic.conf

Browse Source 
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>
This commit is contained in:
Doug Goldstein 2024-11-13 13:26:03 -06:00
parent a556dbe232
commit 5e9ce316b7
No known key found for this signature in database
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/Chart.yaml
View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Ironic description: OpenStack-Helm Ironic
name: ironic name: ironic
version: 0.2.20 version: 0.2.21
home: https://docs.openstack.org/ironic/latest/ home: https://docs.openstack.org/ironic/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Ironic/OpenStack_Project_Ironic_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Ironic/OpenStack_Project_Ironic_vertical.png
sources: sources:

2
ironic/templates/bin/_ironic-conductor-init.sh.tpl
View File

@ -35,7 +35,7 @@ if [ "x" == "x${PXE_IP}" ]; then
fi fi
# ensure the tempdir exists, read it from the config # 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 if [ -n "${ironictmpdir}" -a ! -d "${ironictmpdir}" ]; then
mkdir -p "${ironictmpdir}" mkdir -p "${ironictmpdir}"
chmod 1777 "${ironictmpdir}" chmod 1777 "${ironictmpdir}"

1
releasenotes/notes/ironic.yaml
View File

@ -24,4 +24,5 @@ ironic:
- 0.2.18 Use service tokens - 0.2.18 Use service tokens
- 0.2.19 Allow extra containers for the conductor - 0.2.19 Allow extra containers for the conductor
- 0.2.20 ensure tempdir is set to a reasonable default - 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
... ...