Skip to content

Commit 8a85658

Browse files
committed
ironic: Fix dnsmasq.log permissions
Closes-Bug: #2093881 Change-Id: I3f45178c07a9cd054e572ff80d0e19fb014d69d3 (cherry picked from commit ac2bbcc)
1 parent 5e94215 commit 8a85658

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

docker/dnsmasq/Dockerfile.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1010
{% set dnsmasq_packages = ['dnsmasq'] %}
1111
{{ macros.install_packages(dnsmasq_packages| customizable("packages")) }}
1212

13+
COPY extend_start.sh /usr/local/bin/kolla_extend_start
14+
RUN chmod 644 /usr/local/bin/kolla_extend_start
15+
1316
{% block dnsmasq_footer %}{% endblock %}
1417
{% block footer %}{% endblock %}

docker/dnsmasq/extend_start.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
3+
if [[ ! -d "/var/log/kolla/ironic" ]]; then
4+
mkdir -p /var/log/kolla/ironic
5+
fi
6+
if [[ $(stat -c %a /var/log/kolla/ironic) != "755" ]]; then
7+
chmod 755 /var/log/kolla/ironic
8+
fi
9+
if [[ ! -r "/var/log/kolla/ironic/dnsmasq.log" ]]; then
10+
touch /var/log/kolla/ironic/dnsmasq.log
11+
chown ironic:ironic /var/log/kolla/ironic/dnsmasq.log
12+
fi

0 commit comments

Comments
 (0)