Neutron logging to rsyslog

Configure neutron to use rsyslog container as logging mechanism

Change-Id: I7cf8a1327f07c7b9c4405ee65cecd373def0fea9
Implements: bp logging-container

3 files changed, 27 insertions, 1 deletions

diff --git a/ansible/roles/common/templates/rsyslog.conf.j2 b/ansible/roles/common/templates/rsyslog.conf.j2
index 61350926a..5fd5f0406 100755
--- a/ansible/roles/common/templates/rsyslog.conf.j2
+++ b/ansible/roles/common/templates/rsyslog.conf.j2
@@ -42,6 +42,24 @@ $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 DynFile,"/var/log/syslog.log"
 *.* ?DynFile
 & ~
diff --git a/ansible/roles/neutron/tasks/start.yml b/ansible/roles/neutron/tasks/start.yml
index a72cd51e8..d028fd2c0 100644
--- a/ansible/roles/neutron/tasks/start.yml
+++ b/ansible/roles/neutron/tasks/start.yml
@@ -64,7 +64,9 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: neutron_server
     image: "{{ neutron_server_image_full }}"
-    volumes: "{{ node_config_directory }}/neutron-server/:/opt/kolla/config_files/:ro"
+    volumes:
+      - "{{ node_config_directory }}/neutron-server/:/opt/kolla/config_files/:ro"
+      - "/var/lib/kolla/dev/log:/dev/log"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: inventory_hostname in groups['neutron-server']
@@ -88,6 +90,7 @@
       - "/run:/run"
       - "/lib/modules:/lib/modules:ro"
       - "{{ node_config_directory }}/neutron-openvswitch-agent/:/opt/kolla/config_files/:ro"
+      - "/var/lib/kolla/dev/log:/dev/log"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: (inventory_hostname in groups['compute'] or inventory_hostname in groups['neutron-agents'])
@@ -112,6 +115,7 @@
       - "/run:/run"
       - "/lib/modules:/lib/modules:ro"
       - "{{ node_config_directory }}/neutron-linuxbridge-agent/:/opt/kolla/config_files/:ro"
+      - "/var/lib/kolla/dev/log:/dev/log"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
       NEUTRON_BRIDGE: "br-ex"
@@ -137,6 +141,7 @@
     volumes:
       - "/run:/run"
       - "{{ node_config_directory }}/neutron-agents/:/opt/kolla/neutron-agents/:ro"
+      - "/var/lib/kolla/dev/log:/dev/log"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: inventory_hostname in groups['neutron-agents']
diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2
index c9bf4725c..65013c2fb 100644
--- a/ansible/roles/neutron/templates/neutron.conf.j2
+++ b/ansible/roles/neutron/templates/neutron.conf.j2
@@ -3,6 +3,9 @@
 verbose = true
 debug = true
 
+use_syslog = True
+syslog_log_facility = LOG_LOCAL0
+
 bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
 bind_port = {{ neutron_server_port }}