diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-17 02:06:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-17 02:06:26 +0000 |
| commit | 6e622fa534cb5063944a0eece591e51f950b52b6 (patch) | |
| tree | c9713d49107b1f14192b9aec0159aad089ad043c /docker | |
| parent | c6da765b49ed83b90b4a7ddb599f5912d1738dde (diff) | |
| parent | 690e6853de1215775c672c9cb6be5190887b37da (diff) | |
| download | kolla-6e622fa534cb5063944a0eece591e51f950b52b6.tar.gz kolla-6e622fa534cb5063944a0eece591e51f950b52b6.zip | |
Merge "Move socket binding to named_volume"
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 | 2 | ||||
| -rw-r--r-- | docker/logging/rsyslog/extend_start.sh | 5 |
4 files changed, 11 insertions, 8 deletions
diff --git a/docker/base/start.sh b/docker/base/start.sh index d75a885f3..d9801d750 100644 --- a/docker/base/start.sh +++ b/docker/base/start.sh @@ -1,6 +1,16 @@ #!/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 + # Processing /var/lib/kolla/config_files/config.json as root. This is necessary # to permit certain files to be controlled by the root user which should # not be writable by the dropped-privileged user, especially /run_command diff --git a/docker/base/sudoers b/docker/base/sudoers index 974f36a29..0ca91304a 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 +%kolla ALL=(root) NOPASSWD: /usr/local/bin/kolla_set_configs, /usr/bin/install, /bin/ln -sf /var/lib/kolla/rsyslog/log /dev/log #includedir /etc/sudoers.d diff --git a/docker/logging/rsyslog/Dockerfile.j2 b/docker/logging/rsyslog/Dockerfile.j2 index 2a955fbf5..84bbd607c 100644 --- a/docker/logging/rsyslog/Dockerfile.j2 +++ b/docker/logging/rsyslog/Dockerfile.j2 @@ -13,6 +13,4 @@ RUN apt-get install -y --no-install-recommends rsyslog \ {% endif %} -COPY extend_start.sh /usr/local/bin/kolla_extend_start - {{ include_footer }} diff --git a/docker/logging/rsyslog/extend_start.sh b/docker/logging/rsyslog/extend_start.sh deleted file mode 100644 index 0742fa0a2..000000000 --- a/docker/logging/rsyslog/extend_start.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -if [[ -e "/dev/log" ]]; then - rm -rf /dev/log -fi |