Remove deprecated logging

Change-Id: I6cdcfd0eb37444fc7e0fa02c4d875dd28537d6b9
This commit is contained in:
Tobias Urdin 2018-11-29 10:29:44 +01:00
parent d8e1123122
commit 2b5f6bc87a
4 changed files with 10 additions and 48 deletions

View File

@ -8,15 +8,6 @@
# (Optional) Ensure state for package.
# Defaults to 'present'
#
# [*debug*]
# (Optional) Should the daemons log debug messages
# Defaults to undef.
#
# [*log_dir*]
# (Optional) Directory where logs should be stored
# If set to $::os_service_default, it will not log to any directory
# Defaults to undef.
#
# [*default_transport_url*]
# (optional) A URL representing the messaging driver to use and its full
# configuration. Transport URLs take the form:
@ -220,18 +211,6 @@
# (optional) If set, use this value for max_overflow with sqlalchemy.
# Defaults to: undef.
# [*use_syslog*]
# (Optional) Use syslog for logging.
# Defaults to undef.
#
# [*use_stderr*]
# (optional) Use stderr for logging
# Defaults to undef.
#
# [*log_facility*]
# (Optional) Syslog facility to receive log lines.
# Defaults to undef.
#
# [*flavor*]
# (optional) Specifies the Authentication method.
# Set to 'standalone' to get Heat to work with a remote OpenStack
@ -294,8 +273,6 @@
#
class heat(
$package_ensure = 'present',
$debug = undef,
$log_dir = undef,
$keystone_ec2_uri = $::os_service_default,
$default_transport_url = $::os_service_default,
$rpc_response_timeout = $::os_service_default,
@ -329,9 +306,6 @@ class heat(
$amqp_username = $::os_service_default,
$amqp_password = $::os_service_default,
$host = $::os_service_default,
$use_syslog = undef,
$use_stderr = undef,
$log_facility = undef,
$database_connection = undef,
$database_max_retries = undef,
$database_idle_timeout = undef,
@ -359,7 +333,6 @@ class heat(
$yaql_limit_iterators = $::os_service_default,
) {
include ::heat::logging
include ::heat::db
include ::heat::deps
include ::heat::params

View File

@ -116,28 +116,16 @@ class heat::logging(
include ::heat::deps
# NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
# to use heat::<myparam> first then heat::logging::<myparam>.
$use_syslog_real = pick($::heat::use_syslog,$use_syslog)
$use_stderr_real = pick($::heat::use_stderr,$use_stderr)
$log_facility_real = pick($::heat::log_facility,$log_facility)
if $log_dir != '' {
$log_dir_real = pick($::heat::log_dir,$log_dir)
} else {
$log_dir_real = $log_dir
}
$debug_real = pick($::heat::debug,$debug)
oslo::log { 'heat_config':
debug => $debug_real,
debug => $debug,
log_config_append => $log_config_append,
log_date_format => $log_date_format,
log_dir => $log_dir_real,
use_syslog => $use_syslog_real,
log_dir => $log_dir,
use_syslog => $use_syslog,
use_json => $use_json,
use_journal => $use_journal,
syslog_log_facility => $log_facility_real,
use_stderr => $use_stderr_real,
syslog_log_facility => $log_facility,
use_stderr => $use_stderr,
logging_context_format_string => $logging_context_format_string,
logging_default_format_string => $logging_default_format_string,
logging_debug_format_suffix => $logging_debug_format_suffix,

View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The deprecated parameters use_syslog, use_stderr, log_facility, log_dir and
debug in the init class is now removed. Please set them in the logging class.

View File

@ -10,9 +10,6 @@ describe 'heat' do
let :params do
{
:package_ensure => 'present',
:debug => 'False',
:use_stderr => 'True',
:log_dir => '/var/log/heat',
:database_connection => 'mysql+pymysql://user@host/database',
:database_idle_timeout => 3600,
:flavor => 'keystone',
@ -57,7 +54,6 @@ describe 'heat' do
shared_examples_for 'a heat base installation' do
it { is_expected.to contain_class('heat::logging') }
it { is_expected.to contain_class('heat::params') }
it 'installs heat common package' do