diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-12 14:41:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-12 14:41:22 +0000 |
| commit | 3f9f267a42ea2dcd09a946dc024e68f9b70d930c (patch) | |
| tree | e998678b063bc7263be8707119f499f5151164d6 | |
| parent | 34460c37c62b46391dcf8fb9eaaea2b5b4c8bb7a (diff) | |
| parent | 2069d7562cf8e4bdcf462fc9c5c4f7adb21a319c (diff) | |
| download | kolla-3f9f267a42ea2dcd09a946dc024e68f9b70d930c.tar.gz kolla-3f9f267a42ea2dcd09a946dc024e68f9b70d930c.zip | |
Merge "Create and chown /etc/heka directory"
| -rw-r--r-- | docker/heka/Dockerfile.j2 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docker/heka/Dockerfile.j2 b/docker/heka/Dockerfile.j2 index bc8db7d4e..4714dd2bd 100644 --- a/docker/heka/Dockerfile.j2 +++ b/docker/heka/Dockerfile.j2 @@ -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 \ && yum clean all \ - && useradd --user-group heka + && useradd --user-group heka \ + && mkdir /etc/heka {% 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 \ && chmod 440 /etc/sudoers.d/heka_sudoers \ && chmod 755 /usr/local/bin/kolla_extend_start \ - && chown -R heka: /usr/share/heka + && chown -R heka: /usr/share/heka /etc/heka {{ include_footer }} |