diff options
| author | Éric Lemoine <elemoine@mirantis.com> | 2016-02-17 14:47:57 +0100 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2016-02-19 21:56:10 +0000 |
| commit | d935f2da68e1fd6952c9e2c2f75152dcde5d87d4 (patch) | |
| tree | e8cef430cac7863081895550ea8d1fdcb96da135 /ansible | |
| parent | 1e863081404a4e133a00d17428dc196e475f241e (diff) | |
| download | kolla-d935f2da68e1fd6952c9e2c2f75152dcde5d87d4.tar.gz kolla-d935f2da68e1fd6952c9e2c2f75152dcde5d87d4.zip | |
Make Heka collect Magnum logs
Partially implements: blueprint heka
Change-Id: I91a977c6a3632c570f7a6054c8de3f5e3cb6932c
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/magnum/tasks/bootstrap.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/magnum/tasks/start.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/magnum/templates/magnum.conf.j2 | 3 |
5 files changed, 7 insertions, 12 deletions
diff --git a/ansible/roles/common/templates/heka-openstack.toml.j2 b/ansible/roles/common/templates/heka-openstack.toml.j2 index 2c8bbbdee..b0cb8ebdd 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)/(?P<Program>.*)\.log' +file_match = '(?P<Service>nova|glance|keystone|neutron|cinder|heat|murano|magnum)/(?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 be49a5ccb..850cfdca5 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 MagnumApiFile,"/var/log/magnum/magnum-api.log" -:syslogtag,contains,"magnum-api" ?MagnumApiFile - -$template MagnumConductorFile,"/var/log/magnum/magnum-conductor.log" -:syslogtag,contains,"magnum-conductor" ?MagnumConductorFile - $template DynFile,"/var/log/syslog.log" *.* { ?DynFile diff --git a/ansible/roles/magnum/tasks/bootstrap.yml b/ansible/roles/magnum/tasks/bootstrap.yml index 21a4f9698..ac33dc4a3 100644 --- a/ansible/roles/magnum/tasks/bootstrap.yml +++ b/ansible/roles/magnum/tasks/bootstrap.yml @@ -48,7 +48,9 @@ BOOTSTRAP: name: "bootstrap_magnum" restart_policy: "never" - volumes: "{{ node_config_directory }}/magnum-api/:{{ container_config_directory }}/:ro" + volumes: + - "{{ node_config_directory }}/magnum-api/:{{ container_config_directory }}/:ro" + - "kolla_logs:/var/log/kolla/" run_once: True delegate_to: "{{ groups['magnum-api'][0] }}" when: database_created diff --git a/ansible/roles/magnum/tasks/start.yml b/ansible/roles/magnum/tasks/start.yml index 51b713684..f98afadf7 100644 --- a/ansible/roles/magnum/tasks/start.yml +++ b/ansible/roles/magnum/tasks/start.yml @@ -7,7 +7,7 @@ name: "magnum_api" volumes: - "{{ node_config_directory }}/magnum-api/:{{ container_config_directory }}/:ro" - - "rsyslog_socket:/var/lib/kolla/rsyslog/" + - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['magnum-api'] - name: Starting magnum-conductor container @@ -18,5 +18,5 @@ name: "magnum_conductor" volumes: - "{{ node_config_directory }}/magnum-conductor/:{{ container_config_directory }}/:ro" - - "rsyslog_socket:/var/lib/kolla/rsyslog/" + - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['magnum-conductor'] diff --git a/ansible/roles/magnum/templates/magnum.conf.j2 b/ansible/roles/magnum/templates/magnum.conf.j2 index 6a2572064..d55d713f4 100644 --- a/ansible/roles/magnum/templates/magnum.conf.j2 +++ b/ansible/roles/magnum/templates/magnum.conf.j2 @@ -1,8 +1,7 @@ [DEFAULT] debug = {{ magnum_logging_debug }} -use_syslog = true -syslog_log_facility = LOG_LOCAL0 +log_dir = /var/log/kolla/magnum {% if service_name == 'magnum-api' %} [api] |