diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml
index bcafb6bc3939e50f775c159dfc983d0c4e7e3875..bb5722867114b6b2be588f788675472b38d98b8a 100644
--- a/ansible/roles/common/defaults/main.yml
+++ b/ansible/roles/common/defaults/main.yml
@@ -10,10 +10,6 @@ ansible_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_
ansible_tag: "{{ openstack_release }}"
ansible_image_full: "{{ ansible_image }}:{{ ansible_tag }}"
-rsyslog_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-rsyslog"
-rsyslog_tag: "{{ openstack_release }}"
-rsyslog_image_full: "{{ rsyslog_image }}:{{ rsyslog_tag }}"
-
heka_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-heka"
heka_tag: "{{ openstack_release }}"
heka_image_full: "{{ heka_image }}:{{ heka_tag }}"
diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml
index 268a3a613a3fdad95be53a38245d2ee00f6ab40f..18f87c610aee46530c831e7a7e46c0facceb2840 100644
--- a/ansible/roles/common/tasks/config.yml
+++ b/ansible/roles/common/tasks/config.yml
@@ -5,7 +5,6 @@
state: "directory"
recurse: yes
with_items:
- - "rsyslog"
- "heka"
- name: Copying over config.json files for services
@@ -13,16 +12,8 @@
src: "{{ item }}.json.j2"
dest: "{{ node_config_directory }}/{{ item }}/config.json"
with_items:
- - "rsyslog"
- "heka"
-- name: Copying over rsyslog.conf
- template:
- src: "{{ item }}.conf.j2"
- dest: "{{ node_config_directory }}/{{ item }}/{{ item }}.conf"
- with_items:
- - "rsyslog"
-
- name: Copying over heka config files
template:
src: "heka-{{ item }}.toml.j2"
diff --git a/ansible/roles/common/tasks/pull.yml b/ansible/roles/common/tasks/pull.yml
index e001028e8a4ef275dd0136be0533c5531bc4c518..d89dd8e68724ff92adde79576fa50c8a96f289d8 100644
--- a/ansible/roles/common/tasks/pull.yml
+++ b/ansible/roles/common/tasks/pull.yml
@@ -1,10 +1,4 @@
---
-- name: Pulling rsyslog image
- kolla_docker:
- action: "pull_image"
- common_options: "{{ docker_common_options }}"
- image: "{{ rsyslog_image_full }}"
-
- name: Pulling kolla-toolbox image
kolla_docker:
action: "pull_image"
diff --git a/ansible/roles/common/tasks/start.yml b/ansible/roles/common/tasks/start.yml
index 23a41ffa26bfbdf429d92da95ee8c04db8be8d3c..e9a1b78bd3a8ce161b4327fcd312bb46aa390a7e 100644
--- a/ansible/roles/common/tasks/start.yml
+++ b/ansible/roles/common/tasks/start.yml
@@ -1,19 +1,4 @@
---
-- name: Starting rsyslog container
- kolla_docker:
- action: "start_container"
- common_options: "{{ docker_common_options }}"
- environment:
- KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
- SKIP_LOG_SETUP:
- image: "{{ rsyslog_image_full }}"
- name: "rsyslog"
- privileged: True
- volumes:
- - "{{ node_config_directory }}/rsyslog/:{{ container_config_directory }}/:ro"
- - "rsyslog:/var/log"
- - "rsyslog_socket:/var/lib/kolla/rsyslog/"
-
- name: Starting heka container
kolla_docker:
action: "start_container"
diff --git a/ansible/roles/common/templates/rsyslog.conf.j2 b/ansible/roles/common/templates/rsyslog.conf.j2
deleted file mode 100644
index 850cfdca5b489a39e98cd55c33d65445e601348d..0000000000000000000000000000000000000000
--- a/ansible/roles/common/templates/rsyslog.conf.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-# provides support for local system logging
-$ModLoad imuxsock
-$AddUnixListenSocket /var/lib/kolla/rsyslog/log
-
-$ModLoad imklog
-$KLogPermitNonKernelFacility on
-$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
-$RepeatedMsgReduction on
-
-$template DynFile,"/var/log/syslog.log"
-*.* {
- ?DynFile
- stop
-}
diff --git a/ansible/roles/common/templates/rsyslog.json.j2 b/ansible/roles/common/templates/rsyslog.json.j2
deleted file mode 100644
index 4222b810981e38e0c8f5ed68c358a400fec13344..0000000000000000000000000000000000000000
--- a/ansible/roles/common/templates/rsyslog.json.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "command": "/usr/sbin/rsyslogd -n",
- "config_files": [
- {
- "source": "{{ container_config_directory }}/rsyslog.conf",
- "dest": "/etc/rsyslog.conf",
- "owner": "root",
- "perm": "0644"
- }
- ]
-}
diff --git a/docker/base/start.sh b/docker/base/start.sh
index 78923c75a7eba7a3b7323c9bf81a7e76b312b13b..fd989584d0f94fc39ae0c0630f025c7ccb67272b 100644
--- a/docker/base/start.sh
+++ b/docker/base/start.sh
@@ -1,16 +1,6 @@
#!/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
-
# Wait for the log socket
if [[ ! "${!SKIP_LOG_SETUP[@]}" && -e /var/lib/kolla/heka ]]; then
while [[ ! -SÂ /var/lib/kolla/heka/log ]]; do
diff --git a/docker/base/sudoers b/docker/base/sudoers
index 0ca91304a6bde11e962d8e33d4dff1cde4accfa5..974f36a2942fceaec6fde9524154e692c66fa3fa 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, /bin/ln -sf /var/lib/kolla/rsyslog/log /dev/log
+%kolla ALL=(root) NOPASSWD: /usr/local/bin/kolla_set_configs, /usr/bin/install
#includedir /etc/sudoers.d
diff --git a/docker/logging/rsyslog/Dockerfile.j2 b/docker/logging/rsyslog/Dockerfile.j2
deleted file mode 100644
index 84bbd607cb0f3b75434e06bf62b75c5a806393ba..0000000000000000000000000000000000000000
--- a/docker/logging/rsyslog/Dockerfile.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-MAINTAINER {{ maintainer }}
-
-{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-
-RUN yum -y install rsyslog \
- && yum clean all
-
-{% elif base_distro in ['ubuntu', 'debian'] %}
-
-RUN apt-get install -y --no-install-recommends rsyslog \
- && apt-get clean
-
-{% endif %}
-
-{{ include_footer }}
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 5b0a1dc5f7fc545ee334bb65289401a65212cd69..f8629e4388fa686bdfac563bd70fb406f4d52285 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -27,8 +27,7 @@ _PROFILE_OPTS = [
cfg.ListOpt('infra',
default=['ceph', 'mariadb', 'haproxy',
'keepalived', 'kolla-toolbox', 'memcached',
- 'mongodb', 'openvswitch', 'rabbitmq', 'rsyslog',
- 'heka'],
+ 'mongodb', 'openvswitch', 'rabbitmq', 'heka'],
help='Infra images'),
cfg.ListOpt('main',
default=['cinder', 'ceilometer', 'glance', 'heat',
@@ -43,12 +42,12 @@ _PROFILE_OPTS = [
default=['kolla-toolbox', 'glance', 'haproxy',
'heat', 'horizon', 'keepalived', 'keystone',
'memcached', 'mariadb', 'neutron', 'nova',
- 'openvswitch', 'rabbitmq', 'rsyslog', 'heka'],
+ 'openvswitch', 'rabbitmq', 'heka'],
help='Default images'),
cfg.ListOpt('gate',
default=['glance', 'haproxy', 'keepalived', 'keystone',
'kolla-toolbox', 'mariadb', 'memcached', 'neutron',
- 'nova', 'openvswitch', 'rabbitmq', 'rsyslog', 'heka'],
+ 'nova', 'openvswitch', 'rabbitmq', 'heka'],
help='Gate images'),
cfg.ListOpt('mesos',
default=['chronos', 'marathon', 'mesos-master', 'mesos-slave',
diff --git a/tools/cleanup-containers b/tools/cleanup-containers
index 2a7a3b910cb719ea45fe1a9397b34f78d4ec5325..adf24f45009554bd69edce416411fbcdd9cef648 100755
--- a/tools/cleanup-containers
+++ b/tools/cleanup-containers
@@ -31,7 +31,6 @@ else
nova_{scheduler,novncproxy,consoleauth,conductor,api,compute,libvirt,spicehtml5proxy,compute_ironic} \
openvswitch_{vswitchd,db} \
rabbitmq{,_bootstrap} \
- rsyslog \
heka \
swift_{account_{auditor,reaper,replicator,server},container_{auditor,replicator,server,updater},object_{auditor,expirer,replicator,server,updater},proxy_server,rsyncd}
)
@@ -48,7 +47,6 @@ else
ceph_mon{,_config} \
rabbitmq \
mongodb \
- rsyslog{,_socket} \
haproxy_socket \
heka{,_socket} \
kolla_logs
diff --git a/tools/deploy_aio.sh b/tools/deploy_aio.sh
index ce53bf6aa0c8bcb0fc892b72f66f1631fbdad8fb..e5c773414fa5f367192f61bef665a735d7339b13 100755
--- a/tools/deploy_aio.sh
+++ b/tools/deploy_aio.sh
@@ -9,7 +9,7 @@ export KOLLA_BASE=$1
export KOLLA_TYPE=$2
function copy_logs {
- docker cp rsyslog:/var/log/ /tmp/logs
+ docker cp heka:/var/log/kolla /tmp/logs
}
function check_failure {