diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-29 10:13:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-29 10:13:10 +0000 |
| commit | 713977166d4477107abce856adc089e2565e61a8 (patch) | |
| tree | 38a3822a1deae5f9ef5b9028e1ebe6fc6ad84043 /docker | |
| parent | a9eee171599116ee7508a5f94933328c5a8d2d02 (diff) | |
| parent | f098e766760f14debab2ca2a6cf8b77963101a70 (diff) | |
| download | kolla-713977166d4477107abce856adc089e2565e61a8.tar.gz kolla-713977166d4477107abce856adc089e2565e61a8.zip | |
Merge "Remove config-external for rsyslog"
Diffstat (limited to 'docker')
| -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 |