Revert "Deprecate use_syslog"

This option is not deprecated and still actual.

This reverts commit eb12a287bef990dcc0b34357ceca3fd772c1175e.

Change-Id: I97e9fdd24ff6731532ca124a8439ddbc6cf5534e

manifests/init.pp

@@ -29,6 +29,10 @@
 #   (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.
@@ -543,10 +547,6 @@
 #   (optional) Deprecated. Key size (in bits) for token signing cert (auto generated certificate)
 #   Defaults to $::os_service_default
 #
-# [*use_syslog*]
-#   (optional) DEPRECATED. Use syslog for logging.
-#   Defaults to undef.
-#
 # == Dependencies
 #  None
 #
@@ -586,6 +586,7 @@ class keystone(
   $debug                                = undef,
   $log_dir                              = undef,
   $log_file                             = undef,
+  $use_syslog                           = undef,
   $use_stderr                           = undef,
   $log_facility                         = undef,
   $catalog_type                         = 'sql',
@@ -682,7 +683,6 @@ class keystone(
   $signing_ca_key                       = $::os_service_default,
   $signing_cert_subject                 = $::os_service_default,
   $signing_key_size                     = $::os_service_default,
-  $use_syslog                           = undef,
 ) inherits keystone::params {
 
   include ::keystone::deps
@@ -696,10 +696,6 @@ class keystone(
     warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
   }
 
-  if $use_syslog {
-    warning('use_syslog is deprecated, has no effect and will be removed in a future release.')
-  }
-
   if ! $catalog_driver {
     validate_re($catalog_type, 'template|sql')
   }

manifests/logging.pp

@@ -8,6 +8,10 @@
 #    (Optional) Should the daemons log debug messages
 #    Defaults to $::os_service_default
 #
+#  [*use_syslog*]
+#    (Optional) Use syslog for logging.
+#    Defaults to $::os_service_default
+#
 #  [*use_stderr*]
 #    (optional) Use stderr for logging
 #    Defaults to $::os_service_default
@@ -104,11 +108,9 @@
 #   (Optional) Deprecated. Should the daemons log verbose messages
 #   Defaults to undef.
 #
-#  [*use_syslog*]
-#    (Optional) Use syslog for logging.
-#    Defaults to undef
-#
+
 class keystone::logging(
+  $use_syslog                    = $::os_service_default,
   $use_stderr                    = $::os_service_default,
   $log_facility                  = $::os_service_default,
   $log_dir                       = '/var/log/keystone',
@@ -129,7 +131,6 @@ class keystone::logging(
   $watch_log_file                = $::os_service_default,
   # DEPRECATED
   $verbose                       = undef,
-  $use_syslog                    = undef,
 ) {
 
   include ::keystone::deps
@@ -138,12 +139,9 @@ class keystone::logging(
     warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
   }
 
-  if $use_syslog {
-    warning('use_syslog is deprecated, has no effect and will be removed in a future release.')
-  }
-
   # 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)
   $log_dir_real = pick($::keystone::log_dir,$log_dir)
@@ -157,6 +155,7 @@ class keystone::logging(
     log_file                      => $log_file_real,
     log_dir                       => $log_dir_real,
     watch_log_file                => $watch_log_file,
+    use_syslog                    => $use_syslog_real,
     syslog_log_facility           => $log_facility_real,
     use_stderr                    => $use_stderr_real,
     logging_context_format_string => $logging_context_format_string,

releasenotes/notes/deprecate-use_syslog-ebcb094a028c2e37.yaml

@@ -1,4 +0,0 @@
----
-deprecations:
-  - use_syslog in DEFAULT section was deprecated in Mitaka, this parameter
-    has no effect and will be removed in a future release.

spec/classes/keystone_logging_spec.rb

@@ -23,6 +23,7 @@ describe 'keystone::logging' do
      :instance_format => '[instance: %(uuid)s] ',
      :instance_uuid_format => '[instance: %(uuid)s] ',
      :log_date_format => '%Y-%m-%d %H:%M:%S',
+     :use_syslog => true,
      :use_stderr => false,
      :log_facility => 'LOG_FOO',
      :log_dir => '/var/log',
@@ -33,6 +34,7 @@ describe 'keystone::logging' do
 
   shared_examples 'basic default logging settings' do
     it 'configures glance logging settins with default values' do
+      is_expected.to contain_keystone_config('DEFAULT/use_syslog').with(:value => '<SERVICE DEFAULT>')
       is_expected.to contain_keystone_config('DEFAULT/use_stderr').with(:value => '<SERVICE DEFAULT>')
       is_expected.to contain_keystone_config('DEFAULT/log_dir').with(:value => '/var/log/keystone')
       is_expected.to contain_keystone_config('DEFAULT/log_file').with(:value => '<SERVICE DEFAULT>')
@@ -42,6 +44,7 @@ describe 'keystone::logging' do
 
   shared_examples 'basic non-default logging settings' do
     it 'configures glance logging settins with non-default values' do
+      is_expected.to contain_keystone_config('DEFAULT/use_syslog').with(:value => 'true')
       is_expected.to contain_keystone_config('DEFAULT/use_stderr').with(:value => 'false')
       is_expected.to contain_keystone_config('DEFAULT/syslog_log_facility').with(:value => 'LOG_FOO')
       is_expected.to contain_keystone_config('DEFAULT/log_dir').with(:value => '/var/log')