openstack/puppet-trove
Code Issues Proposed changes

Option to specify the trove guestagent log file.

Browse Source 
Change-Id: Ifaf124933bca6b64d6a2d5225a5f67e58058e26f
Closes-Bug: #1506835
This commit is contained in:
Shaik Apsar 2016-05-25 14:04:16 -04:00 committed by Alex Schultz
parent 4d5c63416f
commit d24a11c35d
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/guestagent.pp
View File

@ -23,7 +23,7 @@
# [*log_file*]
# (optional) The path of file used for logging
# If set to boolean false, it will not log to any file.
# Default: /var/log/trove/guestagent.log
# Default: /var/log/trove/trove-guestagent.log
#
# [*log_dir*]
# (optional) directory to which trove logs are sent.
@ -103,7 +103,7 @@ class trove::guestagent(
$manage_service = true,
$ensure_package = 'present',
$debug = $::os_service_default,
$log_file = '/var/log/trove/guestagent.log',
$log_file = '/var/log/trove/trove-guestagent.log',
$log_dir = '/var/log/trove',
$use_syslog = $::os_service_default,
$log_facility = $::os_service_default,

6
manifests/taskmanager.pp
View File

@ -51,6 +51,11 @@
# (optional) Use syslog for logging.
# Defaults to $::os_service_default
#
# [*guest_log_file*]
# (optional) The path of file used for logging.
# If set to boolean false, it will not log to any file.
# Defaults to '/var/log/trove/trove-guestagent.log'
#
# [*log_facility*]
# (optional) Syslog facility to receive log lines.
# Defaults to 'LOG_USER'.
@ -92,6 +97,7 @@ class trove::taskmanager(
$log_file = '/var/log/trove/trove-taskmanager.log',
$log_dir = '/var/log/trove',
$use_syslog = $::os_service_default,
$guest_log_file = '/var/log/trove/trove-guestagent.log',
$log_facility = $::os_service_default,
$auth_url = 'http://localhost:5000/v2.0',
$heat_url = false,

2
spec/classes/trove_guestagent_spec.rb
View File

@ -30,7 +30,7 @@ describe 'trove::guestagent' do
is_expected.to contain_trove_guestagent_config('DEFAULT/debug').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_guestagent_config('DEFAULT/use_syslog').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_guestagent_config('DEFAULT/syslog_log_facility').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_guestagent_config('DEFAULT/log_file').with_value('/var/log/trove/guestagent.log')
is_expected.to contain_trove_guestagent_config('DEFAULT/log_file').with_value('/var/log/trove/trove-guestagent.log')
is_expected.to contain_trove_guestagent_config('DEFAULT/log_dir').with_value('/var/log/trove')
is_expected.to contain_trove_guestagent_config('DEFAULT/os_region_name').with_value('RegionOne')
is_expected.to contain_trove_guestagent_config('DEFAULT/control_exchange').with_value('trove')

2
templates/trove-guestagent.conf.erb
View File

@ -22,7 +22,7 @@ debug = <%= @debug %>
# Directory and path for log files
log_dir = <%= @log_dir %>
log_file = <%= @log_file %>
log_file = <%= @guest_log_file %>
# Path to the extensions