openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix permission for /var/log/kolla folder"

Browse Source
This commit is contained in:
Jenkins 2016-09-22 09:33:06 +00:00 committed by Gerrit Code Review
commit b5630840dd
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/base/Dockerfile.j2
View File

@ -281,6 +281,9 @@ RUN touch /usr/local/bin/kolla_extend_start \
&& chmod 755 /usr/local/bin/kolla_start /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_set_configs \ && chmod 755 /usr/local/bin/kolla_start /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_set_configs \
&& chmod 440 /etc/sudoers \ && chmod 440 /etc/sudoers \
&& groupadd kolla \ && groupadd kolla \
&& mkdir -p /var/log/kolla \
&& chown :kolla /var/log/kolla \
&& chmod 2775 /var/log/kolla \
&& rm -f /tmp/kolla_bashrc \ && rm -f /tmp/kolla_bashrc \
&& curl -sSL https://github.com/Yelp/dumb-init/releases/download/v1.1.3/dumb-init_1.1.3_amd64 -o /usr/local/bin/dumb-init \ && curl -sSL https://github.com/Yelp/dumb-init/releases/download/v1.1.3/dumb-init_1.1.3_amd64 -o /usr/local/bin/dumb-init \
&& chmod +x /usr/local/bin/dumb-init && chmod +x /usr/local/bin/dumb-init

3
docker/ceph/ceph-base/Dockerfile.j2
View File

@ -25,7 +25,8 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(ceph_base_packages | customizable("packages")) }} {{ macros.install_packages(ceph_base_packages | customizable("packages")) }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start \
&& usermod -a -G kolla ceph
{% block ceph_base_footer %}{% endblock %} {% block ceph_base_footer %}{% endblock %}
{% block footer %}{% endblock %} {% block footer %}{% endblock %}