Merge "Remove all Heka related remaining stuff"

This commit is contained in:
Jenkins 2017-03-15 19:36:14 +00:00 committed by Gerrit Code Review
commit 11c57b3413
4 changed files with 1 additions and 10 deletions

View File

@ -32,7 +32,6 @@ nova_services:
- "kolla_logs:/var/log/kolla" - "kolla_logs:/var/log/kolla"
- "nova_compute:/var/lib/nova" - "nova_compute:/var/lib/nova"
- "{% if enable_cinder_backend_nfs | bool %}/var/lib/nova/mnt:/var/lib/nova/mnt:shared{% endif %}" - "{% if enable_cinder_backend_nfs | bool %}/var/lib/nova/mnt:/var/lib/nova/mnt:shared{% endif %}"
- "heka_socket:/var/lib/kolla/heka/"
placement-api: placement-api:
container_name: "placement_api" container_name: "placement_api"
group: "placement-api" group: "placement-api"

View File

@ -160,7 +160,6 @@
- "{{ node_config_directory }}/swift-object-server/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/swift-object-server/:{{ container_config_directory }}/:ro"
- "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}" - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "heka_socket:/var/lib/kolla/heka/"
when: inventory_hostname in groups['swift-object-server'] when: inventory_hostname in groups['swift-object-server']
- name: Starting swift-object-auditor container - name: Starting swift-object-auditor container

View File

@ -139,13 +139,6 @@ that Kolla uses throughout that should be followed.
include service specific setup and steps as not all services can be include service specific setup and steps as not all services can be
upgraded in the same way. 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 * Logrotation
- For OpenStack services there should be a ``cron-logrotate-PROJECT.conf.j2`` - For OpenStack services there should be a ``cron-logrotate-PROJECT.conf.j2``

View File

@ -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 The logs from all services in all containers may be read from
``/var/log/kolla/SERVICE_NAME`` ``/var/log/kolla/SERVICE_NAME``