From 77c9d421729de5f2228cf4c9f154d695b72e8d25 Mon Sep 17 00:00:00 2001
From: Michal Jastrzebski <inc007@gmail.com>
Date: Thu, 24 Sep 2015 18:17:48 +0200
Subject: [PATCH] Cinder logging to rsyslog
Configure cinder to use rsyslog container as logging mechanism
Change-Id: Ib860ac897643a6377dfc79f0c68281843dc34691
Implements: bp logging-container
---
ansible/roles/cinder/tasks/start.yml | 16 ++++++++++++----
ansible/roles/cinder/templates/cinder.conf.j2 | 2 ++
ansible/roles/common/templates/rsyslog.conf.j2 | 12 ++++++++++++
3 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/ansible/roles/cinder/tasks/start.yml b/ansible/roles/cinder/tasks/start.yml
index a55412c5e9..a85d64097c 100644
--- a/ansible/roles/cinder/tasks/start.yml
+++ b/ansible/roles/cinder/tasks/start.yml
@@ -12,7 +12,9 @@
insecure_registry: "{{ docker_insecure_registry }}"
name: cinder_api
image: "{{ cinder_api_image_full }}"
- volumes: "{{ node_config_directory }}/cinder-api/:/opt/kolla/config_files/:ro"
+ volumes:
+ - "{{ node_config_directory }}/cinder-api/:/opt/kolla/config_files/:ro"
+ - "/var/lib/kolla/dev/log:/dev/log"
env:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
when: inventory_hostname in groups['cinder-api']
@@ -31,7 +33,9 @@
insecure_registry: "{{ docker_insecure_registry }}"
name: cinder_backup
image: "{{ cinder_backup_image_full }}"
- volumes: "{{ node_config_directory }}/cinder-backup/:/opt/kolla/config_files/:ro"
+ volumes:
+ - "{{ node_config_directory }}/cinder-backup/:/opt/kolla/config_files/:ro"
+ - "/var/lib/kolla/dev/log:/dev/log"
env:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
when: inventory_hostname in groups['cinder-backup']
@@ -50,7 +54,9 @@
insecure_registry: "{{ docker_insecure_registry }}"
name: cinder_scheduler
image: "{{ cinder_scheduler_image_full }}"
- volumes: "{{ node_config_directory }}/cinder-scheduler/:/opt/kolla/config_files/:ro"
+ volumes:
+ - "{{ node_config_directory }}/cinder-scheduler/:/opt/kolla/config_files/:ro"
+ - "/var/lib/kolla/dev/log:/dev/log"
env:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
when: inventory_hostname in groups['cinder-scheduler']
@@ -70,7 +76,9 @@
privileged: True
name: cinder_volume
image: "{{ cinder_volume_image_full }}"
- volumes: "{{ node_config_directory }}/cinder-volume/:/opt/kolla/config_files/:ro"
+ volumes:
+ - "{{ node_config_directory }}/cinder-volume/:/opt/kolla/config_files/:ro"
+ - "/var/lib/kolla/dev/log:/dev/log"
env:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
when: inventory_hostname in groups['cinder-volume']
diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2
index 305270fed9..7ad5fe76bd 100644
--- a/ansible/roles/cinder/templates/cinder.conf.j2
+++ b/ansible/roles/cinder/templates/cinder.conf.j2
@@ -1,6 +1,8 @@
[DEFAULT]
verbose = true
debug = true
+use_syslog = True
+syslog_log_facility = LOG_LOCAL0
enable_v1_api=false
volume_name_template = %s
glance_api_servers = http://{{ kolla_internal_address }}:{{ glance_api_port }}
diff --git a/ansible/roles/common/templates/rsyslog.conf.j2 b/ansible/roles/common/templates/rsyslog.conf.j2
index 8e129addaf..2108f6467f 100755
--- a/ansible/roles/common/templates/rsyslog.conf.j2
+++ b/ansible/roles/common/templates/rsyslog.conf.j2
@@ -66,6 +66,18 @@ $template KeystoneErrorFile,"/var/log/keystone/keystone-error.log"
$template KeystoneAccessFile,"/var/log/keystone/keystone-access.log"
:syslogtag,contains,"keystone-access" ?KeystoneAccessFile
+$template CinderApiFile,"/var/log/cinder/cinder-api.log"
+:syslogtag,contains,"cinder-api" ?CinderApiFile
+
+$template CinderBackupFile,"/var/log/cinder/cinder-backup.log"
+:syslogtag,contains,"cinder-backup" ?CinderBackupFile
+
+$template CinderSchedulerFile,"/var/log/cinder/cinder-scheduler.log"
+:syslogtag,contains,"cinder-scheduler" ?CinderSchedulerFile
+
+$template CinderVolumeFile,"/var/log/cinder/cinder-volume.log"
+:syslogtag,contains,"cinder-volume" ?CinderVolumeFile
+
$template DynFile,"/var/log/syslog.log"
*.* ?DynFile
& ~