diff options
| author | Zuul <zuul@review.opendev.org> | 2025-01-13 18:40:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-01-13 18:40:42 +0000 |
| commit | f86849dcbe641dd78b73c6d6b626cffd8f67710c (patch) | |
| tree | 782613e82862f45151368e169a34eff9ba826fd0 | |
| parent | ac2bbcc9f19f039cc2414fe090029f37cf781176 (diff) | |
| parent | a9c94abf530f3ed36b9b3f10c89549f04af26df4 (diff) | |
| download | kolla-f86849dcbe641dd78b73c6d6b626cffd8f67710c.tar.gz kolla-f86849dcbe641dd78b73c6d6b626cffd8f67710c.zip | |
Merge "openvswitch: Fix logs dir permission"
| -rw-r--r-- | docker/openvswitch/openvswitch-base/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/openvswitch/openvswitch-db-server/extend_start.sh | 5 | ||||
| -rw-r--r-- | docker/openvswitch/openvswitch-vswitchd/extend_start.sh | 5 |
3 files changed, 12 insertions, 0 deletions
diff --git a/docker/openvswitch/openvswitch-base/extend_start.sh b/docker/openvswitch/openvswitch-base/extend_start.sh index 767194e04..1b0ed1300 100644 --- a/docker/openvswitch/openvswitch-base/extend_start.sh +++ b/docker/openvswitch/openvswitch-base/extend_start.sh @@ -7,4 +7,6 @@ if [[ $(stat -c %a /var/log/kolla/openvswitch) != "755" ]]; then chmod 755 /var/log/kolla/openvswitch fi +chown -R openvswitch:openvswitch /var/log/kolla/openvswitch + . /usr/local/bin/kolla_openvswitch_extend_start diff --git a/docker/openvswitch/openvswitch-db-server/extend_start.sh b/docker/openvswitch/openvswitch-db-server/extend_start.sh index 6bb04af16..d25038bdd 100644 --- a/docker/openvswitch/openvswitch-db-server/extend_start.sh +++ b/docker/openvswitch/openvswitch-db-server/extend_start.sh @@ -8,3 +8,8 @@ fi if [[ $(ovsdb-tool needs-conversion /var/lib/openvswitch/conf.db) == yes ]]; then ovsdb-tool convert "/var/lib/openvswitch/conf.db" fi + +if [[ ! -r "/var/log/kolla/openvswitch/ovsdb-server.log" ]]; then + touch /var/log/kolla/openvswitch/ovsdb-server.log + chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovsdb-server.log +fi diff --git a/docker/openvswitch/openvswitch-vswitchd/extend_start.sh b/docker/openvswitch/openvswitch-vswitchd/extend_start.sh index e2fc55465..fde542130 100644 --- a/docker/openvswitch/openvswitch-vswitchd/extend_start.sh +++ b/docker/openvswitch/openvswitch-vswitchd/extend_start.sh @@ -1,3 +1,8 @@ #!/bin/bash +if [[ ! -r "/var/log/kolla/openvswitch/ovs-vswitchd.log" ]]; then + touch /var/log/kolla/openvswitch/ovs-vswitchd.log + chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovs-vswitchd.log +fi + modprobe openvswitch |