diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-23 16:37:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-23 16:37:56 +0000 |
| commit | 56c32ac39aed6a7a0cff334e6b57e9e27037499b (patch) | |
| tree | 9ea99d37921edf409e2dd2cc6282d06d8abf5d23 /docker | |
| parent | a431b695606fdbb0d93aa45fa806c972497e61de (diff) | |
| parent | 0417844b8d1babf3bb95d5237c7811c06d9b6347 (diff) | |
| download | kolla-56c32ac39aed6a7a0cff334e6b57e9e27037499b.tar.gz kolla-56c32ac39aed6a7a0cff334e6b57e9e27037499b.zip | |
Merge "Remove Rsyslog entirely"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/start.sh | 10 | ||||
| -rw-r--r-- | docker/base/sudoers | 2 | ||||
| -rw-r--r-- | docker/logging/rsyslog/Dockerfile.j2 | 16 |
3 files changed, 1 insertions, 27 deletions
diff --git a/docker/base/start.sh b/docker/base/start.sh index 78923c75a..fd989584d 100644 --- a/docker/base/start.sh +++ b/docker/base/start.sh @@ -1,16 +1,6 @@ #!/bin/bash set -o errexit -# TODO(SamYaple): After we merge Heka it should be possible to remove -# this symlink, investigate that after Heka is finalized -# NOTE(SamYaple): Setting up logging socket to /dev/log -if [[ ! "${!SKIP_LOG_SETUP[@]}" && -e /var/lib/kolla/rsyslog ]]; then - while [[ ! -S /var/lib/kolla/rsyslog/log ]]; do - sleep 1 - done - sudo ln -sf /var/lib/kolla/rsyslog/log /dev/log -fi - # Wait for the log socket if [[ ! "${!SKIP_LOG_SETUP[@]}" && -e /var/lib/kolla/heka ]]; then while [[ ! -S /var/lib/kolla/heka/log ]]; do diff --git a/docker/base/sudoers b/docker/base/sudoers index 0ca91304a..974f36a29 100644 --- a/docker/base/sudoers +++ b/docker/base/sudoers @@ -13,6 +13,6 @@ root ALL=(ALL) ALL # anyone in the kolla group may run /usr/local/bin/kolla_set_configs as the # root user via sudo without password confirmation -%kolla ALL=(root) NOPASSWD: /usr/local/bin/kolla_set_configs, /usr/bin/install, /bin/ln -sf /var/lib/kolla/rsyslog/log /dev/log +%kolla ALL=(root) NOPASSWD: /usr/local/bin/kolla_set_configs, /usr/bin/install #includedir /etc/sudoers.d diff --git a/docker/logging/rsyslog/Dockerfile.j2 b/docker/logging/rsyslog/Dockerfile.j2 deleted file mode 100644 index 84bbd607c..000000000 --- a/docker/logging/rsyslog/Dockerfile.j2 +++ /dev/null @@ -1,16 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} - -{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install rsyslog \ - && yum clean all - -{% elif base_distro in ['ubuntu', 'debian'] %} - -RUN apt-get install -y --no-install-recommends rsyslog \ - && apt-get clean - -{% endif %} - -{{ include_footer }} |