Set default value for log_dir in heat.conf

When use_syslog is false, heat will use log_dir to store log files,
but default value of log_dir is none in heat, so heat will output
log to stdout.
This patch set the log_dir's default value to /var/log/heat/.

Closes-Bug: #1446963
Change-Id: Ia53b557d56662994e095ccd1e2c3ca583460b55d
This commit is contained in:
Ethan Lynn 2015-04-22 13:39:25 +08:00
parent b47d5e8895
commit f9b8b4b9ba
3 changed files with 3 additions and 2 deletions

View File

@ -26,6 +26,7 @@ default['openstack']['orchestration']['custom_template_banner'] = '
default['openstack']['orchestration']['verbose'] = 'False'
default['openstack']['orchestration']['debug'] = 'False'
default['openstack']['orchestration']['log_dir'] = '/var/log/heat'
# This is the name of the Chef role that will install the Keystone Service API
default['openstack']['orchestration']['identity_service_chef_role'] = 'os-identity'

View File

@ -284,6 +284,7 @@ shared_examples 'expects to create heat conf' do
%r{^signing_dir=/var/cache/heat$},
/^debug=False$/,
/^verbose=False$/,
%r{^log_dir=/var/log/heat$},
/^notification_driver = heat.openstack.common.notifier.rpc_notifier$/,
/^default_notification_level = INFO$/,
/^default_publisher_id = $/,
@ -303,7 +304,6 @@ shared_examples 'expects to create heat conf' do
/^admin_tenant_name=service$/,
/^deferred_auth_method=trusts$/,
/^stack_scheduler_hints=false$/,
%r{^signing_dir=/var/cache/heat$},
/^region_name_for_services=RegionOne$/
].each do |line|
expect(chef_run).to render_file(file.name).with_content(line)

View File

@ -457,7 +457,7 @@ log_config = /etc/openstack/logging.conf
# (Optional) The base directory used for relative --log-file
# paths. (string value)
# Deprecated group/name - [DEFAULT]/logdir
#log_dir=<None>
log_dir=<%= node["openstack"]["orchestration"]["log_dir"] %>
# Use syslog for logging. Existing syslog format is DEPRECATED
# during I, and will change in J to honor RFC5424. (boolean