openstack/kolla-ansible
Code Issues Proposed changes

Merge "Create and chown /etc/heka directory"

Browse Source
This commit is contained in:
Jenkins 2016-04-12 14:41:22 +00:00 committed by Gerrit Code Review
commit 3f9f267a42
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/heka/Dockerfile.j2
View File

@ -5,7 +5,8 @@ MAINTAINER {{ maintainer }}
RUN yum -y install https://github.com/mozilla-services/heka/releases/download/v0.10.0/heka-0_10_0-linux-amd64.rpm \ RUN yum -y install https://github.com/mozilla-services/heka/releases/download/v0.10.0/heka-0_10_0-linux-amd64.rpm \
&& yum clean all \ && yum clean all \
&& useradd --user-group heka && useradd --user-group heka \
&& mkdir /etc/heka
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
@ -25,7 +26,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN usermod -a -G kolla heka \ RUN usermod -a -G kolla heka \
&& chmod 440 /etc/sudoers.d/heka_sudoers \ && chmod 440 /etc/sudoers.d/heka_sudoers \
&& chmod 755 /usr/local/bin/kolla_extend_start \ && chmod 755 /usr/local/bin/kolla_extend_start \
&& chown -R heka: /usr/share/heka && chown -R heka: /usr/share/heka /etc/heka
{{ include_footer }} {{ include_footer }}