openstack
/
kolla
Code Issues Proposed changes

Merge "Configure sudoers for zun containers" into stable/rocky

This commit is contained in:
Zuul 2018-10-17 11:21:09 +00:00 committed by Gerrit Code Review
parent 904186796d 0da117f0c2
commit a2a8a723ba
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/zun/zun-base/Dockerfile.j2
View File

@ -56,9 +56,12 @@ RUN ln -s zun-base-source/* zun \
{% endif %}
COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_zun_extend_start \
RUN chmod 750 /etc/sudoers.d \
&& chmod 640 /etc/sudoers.d/kolla_zun_sudoers \
&& touch /usr/local/bin/kolla_zun_extend_start \
&& chmod 755 /var/www/cgi-bin/zun \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_zun_extend_start

1
docker/zun/zun-base/zun_sudoers Normal file
View File

@ -0,0 +1 @@
zun ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/zun-rootwrap /etc/zun/rootwrap.conf *

2
docker/zun/zun-compute/Dockerfile.j2
View File

@ -12,3 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% block zun_compute_footer %}{% endblock %}
{% block footer %}{% endblock %}
USER zun

2
docker/zun/zun-wsproxy/Dockerfile.j2
View File

@ -12,3 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% block zun_wsproxy_footer %}{% endblock %}
{% block footer %}{% endblock %}
USER zun