From 22892835e9ed62bc29b85e7e3999a1f12ab86b33 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Thu, 29 Nov 2018 10:05:40 +0100
Subject: [PATCH] Remove deprecated logging

Change-Id: Ie331f058148f79a95bb8343f920654ef7dd5798b
---
 manifests/init.pp                   | 27 ---------------------------
 manifests/logging.pp                | 22 +++++-----------------
 spec/classes/designate_init_spec.rb |  4 +---
 3 files changed, 6 insertions(+), 47 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 72438fca..75a17f80 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -16,27 +16,6 @@
 #  (optional) Whether the designate-common package will be present..
 #  Defaults to 'present'
 #
-# [*debug*]
-#   (optional) should the daemons log debug messages.
-#   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
-#
-# [*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
-#
 # [*root_helper*]
 #   (optional) Command for designate rootwrap helper.
 #   Defaults to 'sudo designate-rootwrap /etc/designate/rootwrap.conf'.
@@ -124,11 +103,6 @@
 class designate(
   $package_ensure             = present,
   $common_package_name        = $::designate::params::common_package_name,
-  $debug                      = undef,
-  $log_dir                    = undef,
-  $use_syslog                 = undef,
-  $use_stderr                 = undef,
-  $log_facility               = undef,
   $root_helper                = 'sudo designate-rootwrap /etc/designate/rootwrap.conf',
   $notification_transport_url = $::os_service_default,
   $rabbit_use_ssl             = false,
@@ -164,7 +138,6 @@ class designate(
   }
 
   include ::designate::deps
-  include ::designate::logging
 
   exec { 'post-designate_config':
     command     => '/bin/echo "designate config has changed"',
diff --git a/manifests/logging.pp b/manifests/logging.pp
index f7dbba51..609a3db1 100644
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -116,26 +116,14 @@ class designate::logging(
 
   include ::designate::deps
 
-  # NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
-  # to use designate::<myparam> first then designate::logging::<myparam>.
-  $use_syslog_real = pick($::designate::use_syslog,$use_syslog)
-  $use_stderr_real = pick($::designate::use_stderr,$use_stderr)
-  $log_facility_real = pick($::designate::log_facility,$log_facility)
-  if $log_dir != '' {
-    $log_dir_real = pick($::designate::log_dir,$log_dir)
-  } else {
-    $log_dir_real = $log_dir
-  }
-  $debug_real = pick($::designate::debug,$debug)
-
   oslo::log { 'designate_config':
-    debug                         => $debug_real,
-    use_syslog                    => $use_syslog_real,
+    debug                         => $debug,
+    use_syslog                    => $use_syslog,
     use_json                      => $use_json,
     use_journal                   => $use_journal,
-    use_stderr                    => $use_stderr_real,
-    log_dir                       => $log_dir_real,
-    syslog_log_facility           => $log_facility_real,
+    use_stderr                    => $use_stderr,
+    log_dir                       => $log_dir,
+    syslog_log_facility           => $log_facility,
     logging_context_format_string => $logging_context_format_string,
     logging_default_format_string => $logging_default_format_string,
     logging_debug_format_suffix   => $logging_debug_format_suffix,
diff --git a/spec/classes/designate_init_spec.rb b/spec/classes/designate_init_spec.rb
index ccdfa1b2..684bef39 100644
--- a/spec/classes/designate_init_spec.rb
+++ b/spec/classes/designate_init_spec.rb
@@ -8,7 +8,6 @@ describe 'designate' do
   let :params do
     {
       :package_ensure        => 'installed',
-      :debug                 => 'False',
       :purge_config          => false,
       :neutron_endpoint_type => 'internalURL',
       :root_helper           => 'sudo designate-rootwrap /etc/designate/rootwrap.conf'
@@ -76,7 +75,6 @@ describe 'designate' do
   shared_examples_for 'a designate base installation' do
 
     it { is_expected.to contain_class('designate::deps') }
-    it { is_expected.to contain_class('designate::logging') }
     it { is_expected.to contain_class('designate::params') }
 
     it 'installs designate common package' do
@@ -93,7 +91,7 @@ describe 'designate' do
       })
     end
 
-    it 'configures debug and verbosity' do
+    it 'configures root_helper' do
       is_expected.to contain_designate_config('DEFAULT/root_helper').with_value( params[:root_helper] )
     end