diff options
| author | Éric Lemoine <elemoine@mirantis.com> | 2016-02-22 09:15:23 -0800 |
|---|---|---|
| committer | Éric Lemoine <elemoine@mirantis.com> | 2016-02-23 01:33:47 -0800 |
| commit | a2fe38bba5ea3e89b380e6fa54aff7e17f9f1d76 (patch) | |
| tree | 87bde9e3733b827f8656ea9c8ef01b6c56e50c25 /ansible | |
| parent | 33fd50e603d48de4f1f2fc25ba649561efc25cac (diff) | |
| download | kolla-a2fe38bba5ea3e89b380e6fa54aff7e17f9f1d76.tar.gz kolla-a2fe38bba5ea3e89b380e6fa54aff7e17f9f1d76.zip | |
Make Heka collect Mistral logs
Partially implements: blueprint heka
Change-Id: Ib6ac3228626360216c2c738ed601d61375b51675
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/common/templates/heka-openstack.toml.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/mistral/tasks/bootstrap_service.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/mistral/tasks/start.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/mistral/templates/mistral.conf.j2 | 6 |
4 files changed, 11 insertions, 7 deletions
diff --git a/ansible/roles/common/templates/heka-openstack.toml.j2 b/ansible/roles/common/templates/heka-openstack.toml.j2 index b0cb8ebdd..3649705b6 100644 --- a/ansible/roles/common/templates/heka-openstack.toml.j2 +++ b/ansible/roles/common/templates/heka-openstack.toml.j2 @@ -6,5 +6,5 @@ filename = "lua_decoders/os_openstack_log.lua" type = "LogstreamerInput" decoder = "openstack_log_decoder" log_directory = "/var/log/kolla" -file_match = '(?P<Service>nova|glance|keystone|neutron|cinder|heat|murano|magnum)/(?P<Program>.*)\.log' +file_match = '(?P<Service>nova|glance|keystone|neutron|cinder|heat|murano|magnum|mistral)/(?P<Program>.*)\.log' differentiator = ["Service", "_", "Program"] diff --git a/ansible/roles/mistral/tasks/bootstrap_service.yml b/ansible/roles/mistral/tasks/bootstrap_service.yml index 538d85056..4ca55c821 100644 --- a/ansible/roles/mistral/tasks/bootstrap_service.yml +++ b/ansible/roles/mistral/tasks/bootstrap_service.yml @@ -12,6 +12,8 @@ BOOTSTRAP: name: "bootstrap_mistral" restart_policy: "never" - volumes: "{{ node_config_directory }}/mistral-api/:{{ container_config_directory }}/:ro" + volumes: + - "{{ node_config_directory }}/mistral-api/:{{ container_config_directory }}/:ro" + - "kolla_logs:/var/log/kolla/" run_once: True delegate_to: "{{ groups['mistral-api'][0] }}" diff --git a/ansible/roles/mistral/tasks/start.yml b/ansible/roles/mistral/tasks/start.yml index 52677ccc1..9987b8aae 100644 --- a/ansible/roles/mistral/tasks/start.yml +++ b/ansible/roles/mistral/tasks/start.yml @@ -7,7 +7,7 @@ image: "{{ mistral_engine_image_full }}" volumes: - "{{ node_config_directory }}/mistral-engine/:{{ container_config_directory }}/:ro" - - "rsyslog_socket:/var/lib/kolla/rsyslog/" + - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['mistral-engine'] - name: Starting mistral-executor container @@ -18,7 +18,7 @@ image: "{{ mistral_executor_image_full }}" volumes: - "{{ node_config_directory }}/mistral-executor/:{{ container_config_directory }}/:ro" - - "rsyslog_socket:/var/lib/kolla/rsyslog/" + - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['mistral-executor'] - name: Starting mistral-api container @@ -29,5 +29,5 @@ image: "{{ mistral_api_image_full }}" volumes: - "{{ node_config_directory }}/mistral-api/:{{ container_config_directory }}/:ro" - - "rsyslog_socket:/var/lib/kolla/rsyslog/" + - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['mistral-api'] diff --git a/ansible/roles/mistral/templates/mistral.conf.j2 b/ansible/roles/mistral/templates/mistral.conf.j2 index 1c2f24c0a..5a18367ef 100644 --- a/ansible/roles/mistral/templates/mistral.conf.j2 +++ b/ansible/roles/mistral/templates/mistral.conf.j2 @@ -1,9 +1,11 @@ [DEFAULT] debug = {{ mistral_logging_debug }} +log_dir = /var/log/kolla/mistral -use_syslog = True -syslog_log_facility = LOG_LOCAL0 +# NOTE(elemoine): set use_stderr to False or the logs will also be sent to +# stderr and collected by Docker +use_stderr = False {% if service_name == 'mistral-api' %} bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} |