diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-22 04:48:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-22 04:48:24 +0000 |
| commit | 279e6b2ed42d15465d567765dc7f09293902d9c7 (patch) | |
| tree | 9522da3b9af735c48b38396fe980df74fc2fd4a9 /docker | |
| parent | 52db885f0d6ddf6697a201816654eb75c723b9ce (diff) | |
| parent | d553514cb74c9cc29bad38bd6d4d9d392389cab8 (diff) | |
| download | kolla-279e6b2ed42d15465d567765dc7f09293902d9c7.tar.gz kolla-279e6b2ed42d15465d567765dc7f09293902d9c7.zip | |
Merge "Configures swift-rsyncd to use non-default port"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/swift/swift-base/swift_sudoers | 4 | ||||
| -rw-r--r-- | docker/swift/swift-rsyncd/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/swift/swift-rsyncd/extend_start.sh | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/docker/swift/swift-base/swift_sudoers b/docker/swift/swift-base/swift_sudoers index b20ac15fb..b67c47df3 100644 --- a/docker/swift/swift-base/swift_sudoers +++ b/docker/swift/swift-base/swift_sudoers @@ -1 +1,3 @@ -swift ALL = (root) NOPASSWD: /var/lib/kolla/venv/bin/swift-rootwrap /etc/swift/rootwrap.conf * +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: /var/lib/kolla/venv/bin/swift-rootwrap /etc/swift/rootwrap.conf * diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2 index 8c6cc6ff2..c2061c774 100644 --- a/docker/swift/swift-rsyncd/Dockerfile.j2 +++ b/docker/swift/swift-rsyncd/Dockerfile.j2 @@ -15,7 +15,6 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} -RUN setcap 'cap_net_bind_service=+ep' /usr/bin/rsync COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start diff --git a/docker/swift/swift-rsyncd/extend_start.sh b/docker/swift/swift-rsyncd/extend_start.sh index b101b4e69..d432b82fb 100644 --- a/docker/swift/swift-rsyncd/extend_start.sh +++ b/docker/swift/swift-rsyncd/extend_start.sh @@ -1,3 +1,3 @@ #!/bin/bash -chown -R swift: /srv/node +sudo chown -R swift:swift /srv/node |