From 33e7f646eddc59c50e0155d45adbc38d89eb8382 Mon Sep 17 00:00:00 2001
From: Bertrand Lallau <bertrand.lallau@thalesgroup.com>
Date: Wed, 15 Mar 2017 17:18:25 +0100
Subject: [PATCH] Remove all Heka related remaining stuff
Heka has been removed and replaced by fluentd.
Refer to https://review.openstack.org/#/c/437874/
Change-Id: Id9f95cbefcd4b1089e2a00a92dc66f387c27f09b
---
ansible/roles/nova/defaults/main.yml | 1 -
ansible/roles/swift/tasks/start.yml | 1 -
doc/CONTRIBUTING.rst | 7 -------
doc/troubleshooting.rst | 2 +-
4 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml
index c28525e9b7..d2edb81c5e 100644
--- a/ansible/roles/nova/defaults/main.yml
+++ b/ansible/roles/nova/defaults/main.yml
@@ -32,7 +32,6 @@ nova_services:
- "kolla_logs:/var/log/kolla"
- "nova_compute:/var/lib/nova"
- "{% if enable_cinder_backend_nfs | bool %}/var/lib/nova/mnt:/var/lib/nova/mnt:shared{% endif %}"
- - "heka_socket:/var/lib/kolla/heka/"
placement-api:
container_name: "placement_api"
group: "placement-api"
diff --git a/ansible/roles/swift/tasks/start.yml b/ansible/roles/swift/tasks/start.yml
index b83b8c962d..212a1476c0 100644
--- a/ansible/roles/swift/tasks/start.yml
+++ b/ansible/roles/swift/tasks/start.yml
@@ -160,7 +160,6 @@
- "{{ node_config_directory }}/swift-object-server/:{{ container_config_directory }}/:ro"
- "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}"
- "/etc/localtime:/etc/localtime:ro"
- - "heka_socket:/var/lib/kolla/heka/"
when: inventory_hostname in groups['swift-object-server']
- name: Starting swift-object-auditor container
diff --git a/doc/CONTRIBUTING.rst b/doc/CONTRIBUTING.rst
index 9d8c0c9af5..849b48bb19 100644
--- a/doc/CONTRIBUTING.rst
+++ b/doc/CONTRIBUTING.rst
@@ -139,13 +139,6 @@ that Kolla uses throughout that should be followed.
include service specific setup and steps as not all services can be
upgraded in the same way.
-* Log delivery
-
- - For OpenStack services the service has be added to the ``file_match``
- parameter in the ``openstack_logstreamer_input`` section in the
- ``heka-openstack.toml.j2`` template file in
- ``ansible/roles/comm/templates`` to deliver log messages to Elasticsearch.
-
* Logrotation
- For OpenStack services there should be a ``cron-logrotate-PROJECT.conf.j2``
diff --git a/doc/troubleshooting.rst b/doc/troubleshooting.rst
index 77d587a116..8d71e5d48a 100644
--- a/doc/troubleshooting.rst
+++ b/doc/troubleshooting.rst
@@ -61,7 +61,7 @@ The logs can be examined by executing:
::
- docker exec -it heka bash
+ docker exec -it fluentd bash
The logs from all services in all containers may be read from
``/var/log/kolla/SERVICE_NAME``