diff options
| author | Éric Lemoine <elemoine@mirantis.com> | 2016-02-17 14:36:44 +0100 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2016-02-19 21:56:10 +0000 |
| commit | 1e863081404a4e133a00d17428dc196e475f241e (patch) | |
| tree | 46e889f569fe1fa8d60898586077550451443d8d /ansible | |
| parent | 82264ab7d6d178b6d69c84016997cd4df34f112a (diff) | |
| download | kolla-1e863081404a4e133a00d17428dc196e475f241e.tar.gz kolla-1e863081404a4e133a00d17428dc196e475f241e.zip | |
Make Heka collect Murano logs
Partially implements: blueprint heka
Change-Id: I17fc4b838d6ba8b6fcfc5c08314fef5fac1c7aff
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/common/templates/heka-openstack.toml.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/common/templates/rsyslog.conf.j2 | 6 | ||||
| -rw-r--r-- | ansible/roles/murano/tasks/bootstrap_service.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/murano/tasks/start.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/murano/templates/murano.conf.j2 | 4 |
5 files changed, 7 insertions, 13 deletions
diff --git a/ansible/roles/common/templates/heka-openstack.toml.j2 b/ansible/roles/common/templates/heka-openstack.toml.j2 index dc35cef18..2c8bbbdee 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)/(?P<Program>.*)\.log' +file_match = '(?P<Service>nova|glance|keystone|neutron|cinder|heat|murano)/(?P<Program>.*)\.log' differentiator = ["Service", "_", "Program"] diff --git a/ansible/roles/common/templates/rsyslog.conf.j2 b/ansible/roles/common/templates/rsyslog.conf.j2 index 91c2c4b99..be49a5ccb 100644 --- a/ansible/roles/common/templates/rsyslog.conf.j2 +++ b/ansible/roles/common/templates/rsyslog.conf.j2 @@ -7,12 +7,6 @@ $KLogPermitNonKernelFacility on $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat $RepeatedMsgReduction on -$template MuranoEngineFile,"/var/log/murano/murano-engine.log" -:syslogtag,contains,"murano-engine" ?MuranoEngineFile - -$template MuranoApiFile,"/var/log/murano/murano-api.log" -:syslogtag,contains,"murano-api" ?MuranoApiFile - $template MagnumApiFile,"/var/log/magnum/magnum-api.log" :syslogtag,contains,"magnum-api" ?MagnumApiFile diff --git a/ansible/roles/murano/tasks/bootstrap_service.yml b/ansible/roles/murano/tasks/bootstrap_service.yml index 887f05cc5..7d803013c 100644 --- a/ansible/roles/murano/tasks/bootstrap_service.yml +++ b/ansible/roles/murano/tasks/bootstrap_service.yml @@ -12,6 +12,8 @@ BOOTSTRAP: name: "bootstrap_murano" restart_policy: "never" - volumes: "{{ node_config_directory }}/murano-api/:{{ container_config_directory }}/:ro" + volumes: + - "{{ node_config_directory }}/murano-api/:{{ container_config_directory }}/:ro" + - "kolla_logs:/var/log/kolla/" run_once: True delegate_to: "{{ groups['murano-api'][0] }}" diff --git a/ansible/roles/murano/tasks/start.yml b/ansible/roles/murano/tasks/start.yml index 9a8bd5e79..ff9ca9fe1 100644 --- a/ansible/roles/murano/tasks/start.yml +++ b/ansible/roles/murano/tasks/start.yml @@ -7,7 +7,7 @@ name: "murano_engine" volumes: - "{{ node_config_directory }}/murano-engine/:{{ container_config_directory }}/:ro" - - "rsyslog_socket:/var/lib/kolla/rsyslog/" + - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['murano-engine'] - name: Starting murano-api container @@ -18,5 +18,5 @@ name: "murano_api" volumes: - "{{ node_config_directory }}/murano-api/:{{ container_config_directory }}/:ro" - - "rsyslog_socket:/var/lib/kolla/rsyslog/" + - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['murano-api'] diff --git a/ansible/roles/murano/templates/murano.conf.j2 b/ansible/roles/murano/templates/murano.conf.j2 index e0bdda137..a64cfb54c 100644 --- a/ansible/roles/murano/templates/murano.conf.j2 +++ b/ansible/roles/murano/templates/murano.conf.j2 @@ -1,9 +1,7 @@ [DEFAULT] debug = {{ murano_logging_debug }} - -use_syslog = True -syslog_log_facility = LOG_LOCAL0 +log_dir = /var/log/kolla/murano {% if service_name == 'murano-api' %} bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} |