Skip to content

Commit ed7c839

Browse files
keukoosfrickler
authored andcommitted
Fix permissions for ironic metrics
This patch adds creation of metrics folder, set permissions and SetGID bit. Closes-Bug: #2097098 Change-Id: Ic46b895775edf5e5fb2b637be49e2de1eb4adf36
1 parent 13d6a66 commit ed7c839

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

docker/ironic/ironic-base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
77

88
{% import "macros.j2" as macros with context %}
99

10-
{{ macros.configure_user(name='ironic') }}
10+
{{ macros.configure_user(name='ironic', shell='/bin/bash') }}
1111

1212
ADD ironic-base-archive /ironic-base-source
1313
ADD ironic_sudoers /etc/sudoers.d/kolla_ironic_sudoers
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
#!/bin/bash
22

33
LOG_PATH=/var/log/kolla/ironic
4+
METRICS_PATH=/var/lib/ironic-metrics
45

56
if [[ ! -d "${LOG_PATH}" ]]; then
67
mkdir -p "${LOG_PATH}"
78
fi
9+
if [[ ! -d "${METRICS_PATH}" ]]; then
10+
sudo mkdir -p "${METRICS_PATH}"
11+
fi
812
if [[ $(stat -c %a "${LOG_PATH}") != "755" ]]; then
913
chmod 755 "${LOG_PATH}"
1014
fi
15+
if [[ $(stat -c %U:%G "${METRICS_PATH}") != "ironic:ironic" ]]; then
16+
sudo chown ironic:ironic "${METRICS_PATH}"
17+
fi
18+
if [[ $(stat -c %a "${METRICS_PATH}") != "2775" ]]; then
19+
sudo chmod 2775 "${METRICS_PATH}"
20+
fi
1121

1222
. /usr/local/bin/kolla_ironic_extend_start
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
ironic ALL = (root) NOPASSWD: /var/lib/kolla/venv/bin/ironic-rootwrap /etc/ironic/rootwrap.conf *
2+
ironic ALL = (root) NOPASSWD: /bin/mkdir -p /var/lib/ironic-metrics, /usr/bin/mkdir -p /var/lib/ironic-metrics
3+
ironic ALL = (root) NOPASSWD: /bin/chown ironic\:ironic /var/lib/ironic-metrics, /usr/bin/chown ironic\:ironic /var/lib/ironic-metrics
4+
ironic ALL = (root) NOPASSWD: /bin/chmod 2755 /var/lib/ironic-metrics, /usr/bin/chmod 2775 /var/lib/ironic-metrics

0 commit comments

Comments
 (0)