diff options
| author | Éric Lemoine <elemoine@mirantis.com> | 2016-02-11 18:49:40 +0100 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2016-02-19 21:49:21 +0000 |
| commit | a2b130d6bacc58a28ed16bf42c4f325d027c2e1f (patch) | |
| tree | e3d70c6a5608f8dcc3c1e46d98371ad178c4a25b /ansible | |
| parent | 684873b89b81245acff8310b208807389d44b7d6 (diff) | |
| download | kolla-a2b130d6bacc58a28ed16bf42c4f325d027c2e1f.tar.gz kolla-a2b130d6bacc58a28ed16bf42c4f325d027c2e1f.zip | |
Make Heka collect Neutron logs
Partially implements: blueprint heka
Change-Id: I70e94f4ef7380c6f376a3066d7ddda042c703637
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 | 18 | ||||
| -rw-r--r-- | ansible/roles/neutron/tasks/bootstrap.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/neutron/tasks/start.yml | 14 | ||||
| -rw-r--r-- | ansible/roles/neutron/templates/neutron.conf.j2 | 7 |
5 files changed, 16 insertions, 29 deletions
diff --git a/ansible/roles/common/templates/heka-openstack.toml.j2 b/ansible/roles/common/templates/heka-openstack.toml.j2 index ace78b71f..db642dd15 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)/(?P<Program>.*)\.log' +file_match = '(?P<Service>nova|glance|keystone|neutron)/(?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 f7323c9d8..080911521 100644 --- a/ansible/roles/common/templates/rsyslog.conf.j2 +++ b/ansible/roles/common/templates/rsyslog.conf.j2 @@ -16,24 +16,6 @@ $template HeatAPICfnFile,"/var/log/heat/heat-api-cfn.log" $template HeatEngineFile,"/var/log/heat/heat-engine.log" :syslogtag,contains,"heat-engine" ?HeatEngineFile -$template NeutronServerFile,"/var/log/neutron/neutron-server.log" -:syslogtag,contains,"neutron-server" ?NeutronServerFile - -$template NeutronOVSAgentFile,"/var/log/neutron/neutron-openvswitch-agent.log" -:syslogtag,contains,"neutron-openvswitch-agent" ?NeutronOVSAgentFile - -$template NeutronLinuxbrAgentFile,"/var/log/neutron/neutron-linuxbridge-agent.log" -:syslogtag,contains,"neutron-linuxbridge-agent" ?NeutronLinuxbrAgentFile - -$template NeutronDHCPAgentFile,"/var/log/neutron/neutron-dhcp-agent.log" -:syslogtag,contains,"neutron-dhcp-agent" ?NeutronDHCPAgentFile - -$template NeutronMetadataAgentFile,"/var/log/neutron/neutron-metadata-agent.log" -:syslogtag,contains,"neutron-metadata-agent" ?NeutronMetadataAgentFile - -$template NeutronL3AgentFile,"/var/log/neutron/neutron-l3-agent.log" -:syslogtag,contains,"neutron-l3-agent" ?NeutronL3AgentFile - $template CinderApiFile,"/var/log/cinder/cinder-api.log" :syslogtag,contains,"cinder-api" ?CinderApiFile diff --git a/ansible/roles/neutron/tasks/bootstrap.yml b/ansible/roles/neutron/tasks/bootstrap.yml index 9eba99be1..45821fa68 100644 --- a/ansible/roles/neutron/tasks/bootstrap.yml +++ b/ansible/roles/neutron/tasks/bootstrap.yml @@ -48,7 +48,9 @@ BOOTSTRAP: name: "bootstrap_neutron" restart_policy: "never" - volumes: "{{ node_config_directory }}/neutron-server/:{{ container_config_directory }}/:ro" + volumes: + - "{{ node_config_directory }}/neutron-server/:{{ container_config_directory }}/:ro" + - "kolla_logs:/var/log/kolla/" run_once: True delegate_to: "{{ groups['neutron-server'][0] }}" when: database_created diff --git a/ansible/roles/neutron/tasks/start.yml b/ansible/roles/neutron/tasks/start.yml index 31b3405b5..48f65f01f 100644 --- a/ansible/roles/neutron/tasks/start.yml +++ b/ansible/roles/neutron/tasks/start.yml @@ -67,7 +67,7 @@ name: "neutron_server" volumes: - "{{ node_config_directory }}/neutron-server/:{{ container_config_directory }}/:ro" - - "rsyslog_socket:/var/lib/kolla/rsyslog/" + - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['neutron-server'] - name: Starting neutron-openvswitch-agent container @@ -81,7 +81,7 @@ - "{{ node_config_directory }}/neutron-openvswitch-agent/:{{ container_config_directory }}/:ro" - "/lib/modules:/lib/modules:ro" - "/run:/run" - - "rsyslog_socket:/var/lib/kolla/rsyslog/" + - "kolla_logs:/var/log/kolla/" when: - ( ( inventory_hostname in groups['compute'] @@ -109,7 +109,7 @@ - "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}/:{{ container_config_directory }}/:ro" - "/lib/modules:/lib/modules:ro" - "/run:/run" - - "rsyslog_socket:/var/lib/kolla/rsyslog/" + - "kolla_logs:/var/log/kolla/" with_sequence: start=1 end={{ num_nova_fake_per_node }} when: - inventory_hostname in groups['compute'] @@ -131,7 +131,7 @@ - "{{ node_config_directory }}/neutron-linuxbridge-agent/:{{ container_config_directory }}/:ro" - "/lib/modules:/lib/modules:ro" - "/run:/run" - - "rsyslog_socket:/var/lib/kolla/rsyslog/" + - "kolla_logs:/var/log/kolla/" when: - (inventory_hostname in groups['compute'] or inventory_hostname in groups['neutron-dhcp-agent'] @@ -151,7 +151,7 @@ - "/run/:/run/" - "/run/netns/:/run/netns/:shared" - "neutron_metadata_socket:/var/lib/neutron/kolla/" - - "rsyslog_socket:/var/lib/kolla/rsyslog/" + - "kolla_logs:/var/log/kolla/" when: - inventory_hostname in groups['neutron-dhcp-agent'] @@ -167,7 +167,7 @@ - "/run:/run" - "/run/netns/:/run/netns/:shared" - "neutron_metadata_socket:/var/lib/neutron/kolla/" - - "rsyslog_socket:/var/lib/kolla/rsyslog/" + - "kolla_logs:/var/log/kolla/" when: - inventory_hostname in groups['neutron-l3-agent'] @@ -182,6 +182,6 @@ - "{{ node_config_directory }}/neutron-metadata-agent/:{{ container_config_directory }}/:ro" - "/run/netns/:/run/netns/:shared" - "neutron_metadata_socket:/var/lib/neutron/kolla/" - - "rsyslog_socket:/var/lib/kolla/rsyslog/" + - "kolla_logs:/var/log/kolla/" when: - inventory_hostname in groups['neutron-metadata-agent'] diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2 index 8db961e8e..6a0f8a162 100644 --- a/ansible/roles/neutron/templates/neutron.conf.j2 +++ b/ansible/roles/neutron/templates/neutron.conf.j2 @@ -2,8 +2,11 @@ [DEFAULT] debug = {{ neutron_logging_debug }} -use_syslog = True -syslog_log_facility = LOG_LOCAL0 +log_dir = /var/log/kolla/neutron + +# NOTE(elemoine): set use_stderr to False or the logs will also be sent to +# stderr and collected by Docker +use_stderr = False bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} bind_port = {{ neutron_server_port }} |
