diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-24 23:36:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-24 23:36:53 +0000 |
| commit | e9c6d3a05a2880555d616dea08fb1d342b599179 (patch) | |
| tree | cbe4e091819b65945645680a2e672086f94190fd /docker | |
| parent | 882398c373e3ff8f4a0719ea5fc4a45a970cbf5b (diff) | |
| parent | f85386085d9a2032c95cc2cc559870f68c91824e (diff) | |
| download | kolla-e9c6d3a05a2880555d616dea08fb1d342b599179.tar.gz kolla-e9c6d3a05a2880555d616dea08fb1d342b599179.zip | |
Merge "Add manila_sudoers file"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/manila/manila-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/manila/manila-base/manila_sudoers | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2 index 305bff96b..b4ea531b9 100644 --- a/docker/manila/manila-base/Dockerfile.j2 +++ b/docker/manila/manila-base/Dockerfile.j2 @@ -19,6 +19,10 @@ RUN ln -s manila-base-source/* manila \ && chown -R manila: /etc/manila /var/lib/manila /var/cache/manila /var/log/manila /home/manila \ && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/manila/rootwrap.conf +COPY manila_sudoers /etc/sudoers.d/manila_sudoers +RUN chmod 750 /etc/sudoers.d \ + && chmod 440 /etc/sudoers.d/manila_sudoers + {% endif %} RUN usermod -a -G kolla manila diff --git a/docker/manila/manila-base/manila_sudoers b/docker/manila/manila-base/manila_sudoers new file mode 100644 index 000000000..623e6789b --- /dev/null +++ b/docker/manila/manila-base/manila_sudoers @@ -0,0 +1 @@ +manila ALL = (root) NOPASSWD: /var/lib/kolla/venv/bin/manila-rootwrap /etc/manila/rootwrap.conf * |