stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #538 from enovance/debug_formatter

Browse Source 
Apply proper log format for OpenStack component
This commit is contained in:
Emilien Macchi 2014-07-10 17:15:03 +02:00
commit 6040ca5074
8 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/compute.pp
View File

@ -99,6 +99,12 @@ class cloud::compute(
# Disable twice logging if syslog is enabled # Disable twice logging if syslog is enabled
if $use_syslog { if $use_syslog {
$log_dir = false $log_dir = false
nova_config {
'DEFAULT/logging_context_format': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
'DEFAULT/logging_default_format': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
'DEFAULT/logging_debug_format': value => '%(funcName)s %(pathname)s:%(lineno)d';
'DEFAULT/logging_exception_format': value => '%(process)d TRACE %(name)s %(instance)s';
}
} else { } else {
$log_dir = '/var/log/nova' $log_dir = '/var/log/nova'
} }

6
manifests/identity.pp
View File

@ -454,6 +454,12 @@ class cloud::identity (
if $use_syslog { if $use_syslog {
$log_dir = false $log_dir = false
$log_file = false $log_file = false
keystone_config {
'DEFAULT/logging_context_format': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
'DEFAULT/logging_default_format': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
'DEFAULT/logging_debug_format': value => '%(funcName)s %(pathname)s:%(lineno)d';
'DEFAULT/logging_exception_format': value => '%(process)d TRACE %(name)s %(instance)s';
}
} else { } else {
$log_dir = '/var/log/keystone' $log_dir = '/var/log/keystone'
$log_file = 'keystone.log' $log_file = 'keystone.log'

6
manifests/image/api.pp
View File

@ -96,6 +96,12 @@ class cloud::image::api(
$log_dir = false $log_dir = false
$log_file_api = false $log_file_api = false
$log_file_registry = false $log_file_registry = false
glance_api_config {
'DEFAULT/logging_context_format': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
'DEFAULT/logging_default_format': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
'DEFAULT/logging_debug_format': value => '%(funcName)s %(pathname)s:%(lineno)d';
'DEFAULT/logging_exception_format': value => '%(process)d TRACE %(name)s %(instance)s';
}
} else { } else {
$log_dir = '/var/log/glance' $log_dir = '/var/log/glance'
$log_file_api = '/var/log/glance/api.log' $log_file_api = '/var/log/glance/api.log'

6
manifests/image/registry.pp
View File

@ -77,6 +77,12 @@ class cloud::image::registry(
$log_dir = false $log_dir = false
$log_file_api = false $log_file_api = false
$log_file_registry = false $log_file_registry = false
glance_registry_config {
'DEFAULT/logging_context_format': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
'DEFAULT/logging_default_format': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
'DEFAULT/logging_debug_format': value => '%(funcName)s %(pathname)s:%(lineno)d';
'DEFAULT/logging_exception_format': value => '%(process)d TRACE %(name)s %(instance)s';
}
} else { } else {
$log_dir = '/var/log/glance' $log_dir = '/var/log/glance'
$log_file_api = '/var/log/glance/api.log' $log_file_api = '/var/log/glance/api.log'

6
manifests/network.pp
View File

@ -100,6 +100,12 @@ class cloud::network(
# Disable twice logging if syslog is enabled # Disable twice logging if syslog is enabled
if $use_syslog { if $use_syslog {
$log_dir = false $log_dir = false
neutron_config {
'DEFAULT/logging_context_format': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
'DEFAULT/logging_default_format': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
'DEFAULT/logging_debug_format': value => '%(funcName)s %(pathname)s:%(lineno)d';
'DEFAULT/logging_exception_format': value => '%(process)d TRACE %(name)s %(instance)s';
}
} else { } else {
$log_dir = '/var/log/neutron' $log_dir = '/var/log/neutron'
} }

6
manifests/orchestration.pp
View File

@ -117,6 +117,12 @@ class cloud::orchestration(
# Disable twice logging if syslog is enabled # Disable twice logging if syslog is enabled
if $use_syslog { if $use_syslog {
$log_dir = false $log_dir = false
heat_config {
'DEFAULT/logging_context_format': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
'DEFAULT/logging_default_format': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
'DEFAULT/logging_debug_format': value => '%(funcName)s %(pathname)s:%(lineno)d';
'DEFAULT/logging_exception_format': value => '%(process)d TRACE %(name)s %(instance)s';
}
} else { } else {
$log_dir = '/var/log/heat' $log_dir = '/var/log/heat'
} }

6
manifests/telemetry.pp
View File

@ -88,6 +88,12 @@ class cloud::telemetry(
# Disable twice logging if syslog is enabled # Disable twice logging if syslog is enabled
if $use_syslog { if $use_syslog {
$log_dir = false $log_dir = false
ceilometer_config {
'DEFAULT/logging_context_format': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
'DEFAULT/logging_default_format': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
'DEFAULT/logging_debug_format': value => '%(funcName)s %(pathname)s:%(lineno)d';
'DEFAULT/logging_exception_format': value => '%(process)d TRACE %(name)s %(instance)s';
}
} else { } else {
$log_dir = '/var/log/ceilometer' $log_dir = '/var/log/ceilometer'
} }

6
manifests/volume.pp
View File

@ -74,6 +74,12 @@ class cloud::volume(
# Disable twice logging if syslog is enabled # Disable twice logging if syslog is enabled
if $use_syslog { if $use_syslog {
$log_dir = false $log_dir = false
cinder_config {
'DEFAULT/logging_context_format': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
'DEFAULT/logging_default_format': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
'DEFAULT/logging_debug_format': value => '%(funcName)s %(pathname)s:%(lineno)d';
'DEFAULT/logging_exception_format': value => '%(process)d TRACE %(name)s %(instance)s';
}
} else { } else {
$log_dir = '/var/log/cinder' $log_dir = '/var/log/cinder'
} }