From dd41ad8a1a65d3428367256c4371760f22cb7226 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 5 Jan 2023 15:24:41 +0900
Subject: [PATCH] Remove logic to handle undef

The logic was added a few cycles ago[1] when we replaced the old
default value (undef). The logic has not been really useful because
puppet automatically omits the undef values.

[1] 26dbd52717f46a1be8586dd61a6f265f8fe56f11

Change-Id: I5e18ee1946efebfe4abdcf398abd5babffaba545
---
 manifests/migration/libvirt.pp | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/manifests/migration/libvirt.pp b/manifests/migration/libvirt.pp
index 6f348c8d4..99dffceac 100644
--- a/manifests/migration/libvirt.pp
+++ b/manifests/migration/libvirt.pp
@@ -263,15 +263,8 @@ class nova::migration::libvirt(
     if $transport_real == 'tls' {
       $auth_tls_real = $auth
       $auth_tcp_real = $::os_service_default
-      $ca_file_real  = pick($ca_file, $::os_service_default)
-      $crl_file_real = pick($crl_file, $::os_service_default)
-
-      if $ca_file == undef {
-        warning('Usage of undef for the ca_file parameter has been deprecated')
-      }
-      if $crl_file == undef {
-        warning('Usage of undef for the crl_file parameter has been deprecated')
-      }
+      $ca_file_real  = $ca_file
+      $crl_file_real = $crl_file
     } elsif $transport_real == 'tcp' {
       $auth_tls_real = $::os_service_default
       $auth_tcp_real = $auth
@@ -284,10 +277,6 @@ class nova::migration::libvirt(
       $crl_file_real = $::os_service_default
     }
 
-    if $listen_address == undef {
-      warning('Usage of undef for the listen_addrss parameter has been deprecated')
-    }
-
     $libvirt_listen_config = $modular_libvirt_real ? {
       true    => 'virtproxyd_config',
       default => 'libvirtd_config'
@@ -300,7 +289,7 @@ class nova::migration::libvirt(
       'auth_tcp'   => { 'value' => $auth_tcp_real, 'quote' => true },
       'ca_file'    => { 'value' => $ca_file_real, 'quote'  => true },
       'crl_file'   => { 'value' => $crl_file_real, 'quote' => true },
-      'listen_addr' => { 'value' => pick($listen_address, $::os_service_default), 'quote' => true }
+      'listen_addr' => { 'value' => $listen_address, 'quote' => true }
     })
 
     if $transport_real == 'tls' or $transport_real == 'tcp' {