diff options
| author | Sam Yaple <sam@yaple.net> | 2015-09-28 13:06:45 +0000 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-09-28 13:46:27 -0700 |
| commit | f098e766760f14debab2ca2a6cf8b77963101a70 (patch) | |
| tree | dcb1d186d5d2d6e6ffa8d630b24494ead6377f1b /docker/logging | |
| parent | 40f9f0816f8f94b4d11012a39af21d50195f9a74 (diff) | |
| download | kolla-f098e766760f14debab2ca2a6cf8b77963101a70.tar.gz kolla-f098e766760f14debab2ca2a6cf8b77963101a70.zip | |
Remove config-external for rsyslog
Additionally, fix privleges for rsyslog container. It needs to be
privleged otherwise it will complain about creating device node
Change-Id: I364858f0a1df01b53cee46db3ec7cd5ecbe82c54
Partially-Implements: blueprint replace-config-external
Diffstat (limited to 'docker/logging')
| -rwxr-xr-x | docker/logging/rsyslog/Dockerfile.j2 | 1 | ||||
| -rwxr-xr-x | docker/logging/rsyslog/config-external.sh | 16 |
2 files changed, 0 insertions, 17 deletions
diff --git a/docker/logging/rsyslog/Dockerfile.j2 b/docker/logging/rsyslog/Dockerfile.j2 index 521968f13..60b81b5ba 100755 --- a/docker/logging/rsyslog/Dockerfile.j2 +++ b/docker/logging/rsyslog/Dockerfile.j2 @@ -12,7 +12,6 @@ RUN apt-get install -y --no-install-recommends \ && apt-get clean {% endif %} -COPY config-external.sh /opt/kolla/ COPY start.sh / CMD ["/start.sh"] diff --git a/docker/logging/rsyslog/config-external.sh b/docker/logging/rsyslog/config-external.sh deleted file mode 100755 index a935f7dba..000000000 --- a/docker/logging/rsyslog/config-external.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -if [[ -f "/dev/log" ]]; then - rm "/dev/log" -fi - -SOURCE="/opt/kolla/rsyslog/rsyslog.conf" -TARGET="/etc/rsyslog.conf" -OWNER="root" - -if [[ -f "$SOURCE" ]]; then - rm $TARGET - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi |