openstack/kolla
Code Issues Proposed changes

Merge "Fix permissions for ironic metrics" into stable/2024.2

Browse Source
This commit is contained in:
Zuul
2026-02-12 10:49:58 +00:00
committed by Gerrit Code Review
parent 2ee7b1b92d f19f6b6bf6
commit a77ec9dac6
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/ironic/ironic-base/Dockerfile.j2
View File

@@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{{ macros.configure_user(name='ironic') }}
{{ macros.configure_user(name='ironic', shell='/bin/bash') }}
ADD ironic-base-archive /ironic-base-source
ADD ironic_sudoers /etc/sudoers.d/kolla_ironic_sudoers

10
docker/ironic/ironic-base/extend_start.sh
View File

@@ -1,12 +1,22 @@
#!/bin/bash
LOG_PATH=/var/log/kolla/ironic
METRICS_PATH=/var/lib/ironic-metrics
if [[ ! -d "${LOG_PATH}" ]]; then
mkdir -p "${LOG_PATH}"
fi
if [[ ! -d "${METRICS_PATH}" ]]; then
sudo mkdir -p "${METRICS_PATH}"
fi
if [[ $(stat -c %a "${LOG_PATH}") != "755" ]]; then
chmod 755 "${LOG_PATH}"
fi
if [[ $(stat -c %U:%G "${METRICS_PATH}") != "ironic:ironic" ]]; then
sudo chown ironic:ironic "${METRICS_PATH}"
fi
if [[ $(stat -c %a "${METRICS_PATH}") != "2775" ]]; then
sudo chmod 2775 "${METRICS_PATH}"
fi
. /usr/local/bin/kolla_ironic_extend_start

3
docker/ironic/ironic-base/ironic_sudoers
View File

@@ -1 +1,4 @@
ironic ALL = (root) NOPASSWD: /var/lib/kolla/venv/bin/ironic-rootwrap /etc/ironic/rootwrap.conf *
ironic ALL = (root) NOPASSWD: /bin/mkdir -p /var/lib/ironic-metrics, /usr/bin/mkdir -p /var/lib/ironic-metrics
ironic ALL = (root) NOPASSWD: /bin/chown ironic\:ironic /var/lib/ironic-metrics, /usr/bin/chown ironic\:ironic /var/lib/ironic-metrics
ironic ALL = (root) NOPASSWD: /bin/chmod 2755 /var/lib/ironic-metrics, /usr/bin/chmod 2775 /var/lib/ironic-metrics