Skip to content

Commit af02eb6

Browse files
mnasiadkaAlex-Welsh
authored andcommitted
ovn: Fix log permissions
ovn is running as root, and fluentd can't read it's log files, so we need to precreate these. Closes-Bug: #2115244 Change-Id: Icb0e47cf95a67cb4585c71f863e542bc59ff5009
1 parent 1b256d5 commit af02eb6

File tree

11 files changed

+44
-0
lines changed

11 files changed

+44
-0
lines changed

docker/ovn/ovn-base/extend_start.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ fi
99
if [[ $(stat -c %a /var/log/kolla/openvswitch) != "755" ]]; then
1010
chmod 755 /var/log/kolla/openvswitch
1111
fi
12+
13+
. /usr/local/bin/kolla_ovn_extend_start

docker/ovn/ovn-controller/Dockerfile.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
2020
{% endif %}
2121
{{ macros.install_packages(ovn_controller_packages | customizable("packages")) }}
2222

23+
COPY extend_start.sh /usr/local/bin/kolla_ovn_extend_start
24+
RUN chmod 644 /usr/local/bin/kolla_ovn_extend_start
25+
2326
{{ macros.kolla_patch_sources() }}
2427

2528
{% block ovn_controller_footer %}{% endblock %}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
if [[ ! -r "/var/log/kolla/openvswitch/ovn-controller.log" ]]; then
4+
touch /var/log/kolla/openvswitch/ovn-controller.log
5+
chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovn-controller.log
6+
fi

docker/ovn/ovn-nb-db-server/Dockerfile.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
2222

2323
COPY start_nb_db_server.sh /usr/local/bin/start-nb-db-server
2424
RUN chmod 755 /usr/local/bin/start-nb-db-server
25+
COPY extend_start.sh /usr/local/bin/kolla_ovn_extend_start
26+
RUN chmod 644 /usr/local/bin/kolla_ovn_extend_start
2527

2628
{{ macros.kolla_patch_sources() }}
2729

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
if [[ ! -r "/var/log/kolla/openvswitch/ovn-nb-db.log" ]]; then
4+
touch /var/log/kolla/openvswitch/ovn-nb-db.log
5+
chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovn-nb-db.log
6+
fi

docker/ovn/ovn-northd/Dockerfile.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
2020
{% endif %}
2121
{{ macros.install_packages(ovn_northd_packages | customizable("packages")) }}
2222

23+
COPY extend_start.sh /usr/local/bin/kolla_ovn_extend_start
24+
RUN chmod 644 /usr/local/bin/kolla_ovn_extend_start
25+
2326
{{ macros.kolla_patch_sources() }}
2427

2528
{% block ovn_northd_footer %}{% endblock %}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
if [[ ! -r "/var/log/kolla/openvswitch/ovn-northd.log" ]]; then
3+
touch /var/log/kolla/openvswitch/ovn-northd.log
4+
chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovn-northd.log
5+
fi

docker/ovn/ovn-sb-db-relay/Dockerfile.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1111
RUN curl -o /usr/share/ovn/scripts/ovn-ctl https://raw.githubusercontent.com/ovn-org/ovn/refs/heads/main/utilities/ovn-ctl
1212
{% endblock %}
1313

14+
COPY extend_start.sh /usr/local/bin/kolla_ovn_extend_start
15+
RUN chmod 644 /usr/local/bin/kolla_ovn_extend_start
16+
1417
{% block ovn_sb_db_relay_footer %}{% endblock %}
1518
{% block footer %}{% endblock %}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
if [[ ! -r "/var/log/kolla/openvswitch/ovn-sb-relay-${RELAY_ID}.log" ]]; then
4+
touch /var/log/kolla/openvswitch/ovn-sb-relay-${RELAY_ID}.log
5+
chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovn-sb-relay-${RELAY_ID}.log
6+
fi

docker/ovn/ovn-sb-db-server/Dockerfile.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
2222

2323
COPY start_sb_db_server.sh /usr/local/bin/start-sb-db-server
2424
RUN chmod 755 /usr/local/bin/start-sb-db-server
25+
COPY extend_start.sh /usr/local/bin/kolla_ovn_extend_start
26+
RUN chmod 644 /usr/local/bin/kolla_ovn_extend_start
2527

2628
{{ macros.kolla_patch_sources() }}
2729

0 commit comments

Comments
 (0)