Merge "Add an ability to manage use_stderr parameter"
This commit is contained in:
commit
775b96af2f
@ -173,6 +173,10 @@
|
|||||||
# Use syslog for logging.
|
# Use syslog for logging.
|
||||||
# (Optional) Defaults to false.
|
# (Optional) Defaults to false.
|
||||||
#
|
#
|
||||||
|
# [*use_stderr*]
|
||||||
|
# (optional) Use stderr for logging
|
||||||
|
# Defaults to true
|
||||||
|
#
|
||||||
# [*log_facility*]
|
# [*log_facility*]
|
||||||
# Syslog facility to receive log lines.
|
# Syslog facility to receive log lines.
|
||||||
# (Optional) Defaults to LOG_USER.
|
# (Optional) Defaults to LOG_USER.
|
||||||
@ -276,6 +280,7 @@ class cinder (
|
|||||||
$key_file = false,
|
$key_file = false,
|
||||||
$api_paste_config = '/etc/cinder/api-paste.ini',
|
$api_paste_config = '/etc/cinder/api-paste.ini',
|
||||||
$use_syslog = false,
|
$use_syslog = false,
|
||||||
|
$use_stderr = true,
|
||||||
$log_facility = 'LOG_USER',
|
$log_facility = 'LOG_USER',
|
||||||
$log_dir = '/var/log/cinder',
|
$log_dir = '/var/log/cinder',
|
||||||
$verbose = false,
|
$verbose = false,
|
||||||
@ -430,6 +435,7 @@ class cinder (
|
|||||||
'database/retry_interval': value => $database_retry_interval;
|
'database/retry_interval': value => $database_retry_interval;
|
||||||
'DEFAULT/verbose': value => $verbose;
|
'DEFAULT/verbose': value => $verbose;
|
||||||
'DEFAULT/debug': value => $debug;
|
'DEFAULT/debug': value => $debug;
|
||||||
|
'DEFAULT/use_stderr': value => $use_stderr;
|
||||||
'DEFAULT/api_paste_config': value => $api_paste_config;
|
'DEFAULT/api_paste_config': value => $api_paste_config;
|
||||||
'DEFAULT/rpc_backend': value => $rpc_backend;
|
'DEFAULT/rpc_backend': value => $rpc_backend;
|
||||||
'DEFAULT/storage_availability_zone': value => $storage_availability_zone;
|
'DEFAULT/storage_availability_zone': value => $storage_availability_zone;
|
||||||
|
@ -37,6 +37,7 @@ describe 'cinder' do
|
|||||||
is_expected.to contain_cinder_config('database/max_overflow').with_ensure('absent')
|
is_expected.to contain_cinder_config('database/max_overflow').with_ensure('absent')
|
||||||
is_expected.to contain_cinder_config('DEFAULT/verbose').with(:value => false)
|
is_expected.to contain_cinder_config('DEFAULT/verbose').with(:value => false)
|
||||||
is_expected.to contain_cinder_config('DEFAULT/debug').with(:value => false)
|
is_expected.to contain_cinder_config('DEFAULT/debug').with(:value => false)
|
||||||
|
is_expected.to contain_cinder_config('DEFAULT/use_stderr').with(:value => true)
|
||||||
is_expected.to contain_cinder_config('DEFAULT/storage_availability_zone').with(:value => 'nova')
|
is_expected.to contain_cinder_config('DEFAULT/storage_availability_zone').with(:value => 'nova')
|
||||||
is_expected.to contain_cinder_config('DEFAULT/default_availability_zone').with(:value => 'nova')
|
is_expected.to contain_cinder_config('DEFAULT/default_availability_zone').with(:value => 'nova')
|
||||||
is_expected.to contain_cinder_config('DEFAULT/api_paste_config').with(:value => '/etc/cinder/api-paste.ini')
|
is_expected.to contain_cinder_config('DEFAULT/api_paste_config').with(:value => '/etc/cinder/api-paste.ini')
|
||||||
|
Loading…
Reference in New Issue
Block a user