From 0417844b8d1babf3bb95d5237c7811c06d9b6347 Mon Sep 17 00:00:00 2001
From: Éric Lemoine <elemoine@mirantis.com>
Date: Mon, 22 Feb 2016 08:13:58 -0800
Subject: Remove Rsyslog entirely

Partially implements: blueprint heka

Change-Id: I1322d2dc870e6f8fe052926995d993e8a08a25db
---
 docker/base/start.sh                 | 10 ----------
 docker/base/sudoers                  |  2 +-
 docker/logging/rsyslog/Dockerfile.j2 | 16 ----------------
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 docker/logging/rsyslog/Dockerfile.j2

(limited to 'docker')

diff --git a/docker/base/start.sh b/docker/base/start.sh
index a42c01391..642987559 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 }}
-- 
cgit v1.2.3