Merge "Remove all Heka related remaining stuff"

7 files changed, 1 insertions, 33 deletions

diff --git a/docker/base/start.sh b/docker/base/start.sh
index 261291268..fce5199d0 100644
--- a/docker/base/start.sh
+++ b/docker/base/start.sh
@@ -1,13 +1,6 @@
 #!/bin/bash
 set -o errexit
 
-# Wait for the log socket
-if [[ ! "${!SKIP_LOG_SETUP[@]}" && -e /var/lib/kolla/heka ]]; then
-    while [[ ! -S /var/lib/kolla/heka/log ]]; do
-        sleep 1
-    done
-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/cron/Dockerfile.j2 b/docker/cron/Dockerfile.j2
index 13745c9a4..6243ada19 100644
--- a/docker/cron/Dockerfile.j2
+++ b/docker/cron/Dockerfile.j2
@@ -19,8 +19,5 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.install_packages(cron_packages | customizable("packages")) }}
 
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 755 /usr/local/bin/kolla_extend_start
-
 {% block cron_footer %}{% endblock %}
 {% block footer %}{% endblock %}
diff --git a/docker/cron/extend_start.sh b/docker/cron/extend_start.sh
deleted file mode 100644
index 08efca96f..000000000
--- a/docker/cron/extend_start.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# NOTE(elemoine): the cron daemon sends its logs to /dev/log. Heka's log socket
-# is at /var/lib/kolla/heka/log so we symlink /dev/log to that location.
-if [[ ! -h /dev/log ]]; then
-    ln -sf /var/lib/kolla/heka/log /dev/log
-fi
diff --git a/docker/keepalived/extend_start.sh b/docker/keepalived/extend_start.sh
index 0cb79767e..e1fe5d9d8 100644
--- a/docker/keepalived/extend_start.sh
+++ b/docker/keepalived/extend_start.sh
@@ -1,12 +1,5 @@
 #!/bin/bash
 
-# NOTE(elemoine): keepalived cannot be configured to change the log address to
-# anything other than /dev/log. Heka's log socket is at /var/lib/kolla/heka/log
-# so we symlink /dev/log to that location.
-if [[ ! -h /dev/log ]]; then
-    ln -sf /var/lib/kolla/heka/log /dev/log
-fi
-
 modprobe ip_vs
 
 # Workaround for bug #1485079
diff --git a/docker/keystone/keystone-ssh/extend_start.sh b/docker/keystone/keystone-ssh/extend_start.sh
index 23744cead..dc8f04b49 100644
--- a/docker/keystone/keystone-ssh/extend_start.sh
+++ b/docker/keystone/keystone-ssh/extend_start.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-if [[ ! -L /dev/log ]]; then
-    ln -sf /var/lib/kolla/heka/log /dev/log
-fi
-
 SSH_HOST_KEY_TYPES=( "rsa" "dsa" "ecdsa" "ed25519" )
 
 for key_type in ${SSH_HOST_KEY_TYPES[@]}; do
diff --git a/docker/macros.j2 b/docker/macros.j2
index 479d33ff8..8c323cde6 100644
--- a/docker/macros.j2
+++ b/docker/macros.j2
@@ -6,7 +6,7 @@
         {#-
           debian_package_install is a utility method to build up an appropriate
           set of commands to install packages in a debian-based environment that
-          may include URL links to a .deb package (e.g, heka)
+          may include URL links to a .deb package
         -#}
         RUN {{ debian_package_install(packages) }}
     {%- endif %}
diff --git a/docker/nova/nova-ssh/extend_start.sh b/docker/nova/nova-ssh/extend_start.sh
index da05e4379..6d52952a7 100644
--- a/docker/nova/nova-ssh/extend_start.sh
+++ b/docker/nova/nova-ssh/extend_start.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-if [[ ! -L /dev/log ]]; then
-    ln -sf /var/lib/kolla/heka/log /dev/log
-fi
-
 SSH_HOST_KEY_TYPES=( "rsa" "dsa" "ecdsa" "ed25519" )
 
 for key_type in ${SSH_HOST_KEY_TYPES[@]}; do