Remove all Heka related remaining stuff
Heka has been removed and replaced by fluentd. Refer to https://review.openstack.org/#/c/437874/ Change-Id: I989e5d71b5ba4d036dd45c02b3923c5bf27a04ed
This commit is contained in:
parent
4607ab5e53
commit
c71e8ba8ff
@ -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
|
||||
|
@ -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 %}
|
||||
|
@ -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
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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 %}
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user