diff options
| author | Zuul <zuul@review.opendev.org> | 2019-11-07 10:27:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-11-07 10:27:57 +0000 |
| commit | 3e8bef4e40e0e00bc27533259843a564d7ecd852 (patch) | |
| tree | cce74a29b915b711e2110f169882d69ed299e90b /docker | |
| parent | 2a17ec861adc94ef6cc2c5192a18ebdf3317ff3e (diff) | |
| parent | 2d122afaf9817cadc668b308c4f736e47c09a55f (diff) | |
| download | kolla-3e8bef4e40e0e00bc27533259843a564d7ecd852.tar.gz kolla-3e8bef4e40e0e00bc27533259843a564d7ecd852.zip | |
Merge "swift-rsyncd: don't recursively chown /srv/node at startup"
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 |