diff options
| author | Martin Chlumsky <martin.chlumsky@ubisoft.com> | 2019-11-04 13:46:49 -0500 |
|---|---|---|
| committer | Martin Chlumsky <martin.chlumsky@gmail.com> | 2019-11-08 18:50:11 +0000 |
| commit | 8673f02844a4a43e6eeb74d6437c2d97b530802a (patch) | |
| tree | 50400686d105e632ba9667c46f0526c36cce7929 /docker | |
| parent | 2692fec709375176f1829d7b0036ff8cb81d890a (diff) | |
| download | kolla-8673f02844a4a43e6eeb74d6437c2d97b530802a.tar.gz kolla-8673f02844a4a43e6eeb74d6437c2d97b530802a.zip | |
swift-rsyncd: don't recursively chown /srv/node at startup
Instead of doing a recursive chown on /srv/node, chown only /srv/node
and any immediate subdirectory under /srv/node.
Change-Id: I8fd93fa77ba9fc63910360300b8783a34bd4e6d5
Closes-Bug: #1851169
(cherry picked from commit 2d122afaf9817cadc668b308c4f736e47c09a55f)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/swift/swift-base/swift_sudoers | 4 | ||||
| -rw-r--r-- | docker/swift/swift-rsyncd/extend_start.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/swift/swift-base/swift_sudoers b/docker/swift/swift-base/swift_sudoers index b67c47df3..752fe0e2e 100644 --- a/docker/swift/swift-base/swift_sudoers +++ b/docker/swift/swift-base/swift_sudoers @@ -1,3 +1,3 @@ -swift ALL=(root) NOPASSWD: /bin/chown -R swift\:swift /srv/node -swift ALL=(root) NOPASSWD: /usr/bin/chown -R swift\:swift /srv/node +swift ALL=(root) NOPASSWD: /bin/find /srv/node/ -maxdepth 1 -type d -execdir chown swift\:swift {} \\+ +swift ALL=(root) NOPASSWD: /usr/bin/find /srv/node/ -maxdepth 1 -type d -execdir chown swift\:swift {} \\+ swift ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/swift-rootwrap /etc/swift/rootwrap.conf * diff --git a/docker/swift/swift-rsyncd/extend_start.sh b/docker/swift/swift-rsyncd/extend_start.sh index 86d24724b..33ff2bf2c 100644 --- a/docker/swift/swift-rsyncd/extend_start.sh +++ b/docker/swift/swift-rsyncd/extend_start.sh @@ -1,4 +1,4 @@ #!/bin/bash -sudo chown -R swift:swift /srv/node +sudo find /srv/node/ -maxdepth 1 -type d -execdir chown swift:swift {} \+ mkdir -p /var/lib/swift/lock |