Remove deprecated logging parameters

Remove those that was moved to keystone::logging
and deprecated in ::keystone.

Change-Id: I99730c7bb7f775aced7aacfbaef6eb7f38525f69

manifests/init.pp

@@ -33,22 +33,6 @@
 #   This is the password that the admin user signs into keystone with.
 #   Required.
 #
-# [*debug*]
-#   (optional) Rather keystone should log at debug level.
-#   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.
-#
 # [*catalog_type*]
 #   (optional) Type of catalog that keystone uses to store endpoints,services.
 #   Defaults to sql. (Also accepts template)
@@ -650,12 +634,8 @@ class keystone(
   $admin_bind_host                      = '0.0.0.0',
   $public_port                          = '5000',
   $admin_port                           = '35357',
-  $debug                                = undef,
   $log_dir                              = undef,
   $log_file                             = undef,
-  $use_syslog                           = undef,
-  $use_stderr                           = undef,
-  $log_facility                         = undef,
   $catalog_type                         = 'sql',
   $catalog_driver                       = false,
   $catalog_template_file                = '/etc/keystone/default_catalog.templates',

manifests/logging.pp

@@ -136,35 +136,18 @@ class keystone::logging(
 
   include ::keystone::deps
 
-  # NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
-  # to use keystone::<myparam> first then keystone::logging::<myparam>.
-  $use_syslog_real = pick($::keystone::use_syslog,$use_syslog)
-  $use_stderr_real = pick($::keystone::use_stderr,$use_stderr)
-  $log_facility_real = pick($::keystone::log_facility,$log_facility)
-  if $log_dir != '' {
-    $log_dir_real = pick($::keystone::log_dir,$log_dir)
-  } else {
-    $log_dir_real = $log_dir
-  }
-  if $log_file != '' {
-    $log_file_real = pick($::keystone::log_file,$log_file)
-  } else {
-    $log_file_real = $log_file
-  }
-  $debug_real = pick($::keystone::debug,$debug)
-
   oslo::log { 'keystone_config':
-    debug                         => $debug_real,
+    debug                         => $debug,
     log_config_append             => $log_config_append,
     log_date_format               => $log_date_format,
-    log_file                      => $log_file_real,
-    log_dir                       => $log_dir_real,
+    log_file                      => $log_file,
+    log_dir                       => $log_dir,
     watch_log_file                => $watch_log_file,
-    use_syslog                    => $use_syslog_real,
+    use_syslog                    => $use_syslog,
     use_journal                   => $use_journal,
     use_json                      => $use_json,
-    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,
@@ -176,5 +159,4 @@ class keystone::logging(
     instance_uuid_format          => $instance_uuid_format,
     fatal_deprecations            => $fatal_deprecations,
   }
-
 }

releasenotes/notes/remove-deprecated-logging-d3004849c0e4e66a.yaml

@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    The deprecated parameters keystone::debug, keystone::use_syslog,
+    keystone::use_stderr and keystone::log_facility is removed, please
+    set them in the keystone::logging class.

spec/classes/keystone_init_spec.rb

@@ -27,8 +27,6 @@ describe 'keystone' do
       'admin_bind_host'                    => '0.0.0.0',
       'public_port'                        => '5000',
       'admin_port'                         => '35357',
-      'debug'                              => false,
-      'use_stderr'                         => true,
       'catalog_type'                       => 'sql',
       'catalog_driver'                     => false,
       'token_provider'                     => 'fernet',
@@ -82,8 +80,6 @@ describe 'keystone' do
       'admin_port'                         => '35358',
       'admin_token'                        => 'service_token_override',
       'admin_password'                     => 'admin_openstack_password',
-      'debug'                              => true,
-      'use_stderr'                         => false,
       'catalog_type'                       => 'template',
       'token_provider'                     => 'uuid',
       'token_driver'                       => 'kvs',
@@ -179,8 +175,6 @@ describe 'keystone' do
        'admin_port',
        'member_role_id',
        'member_role_name',
-       'debug',
-       'use_stderr'
       ].each do |config|
         is_expected.to contain_keystone_config("DEFAULT/#{config}").with_value(param_hash[config])
       end