openstack/puppet-nova
Code Issues Proposed changes

Merge "Remove logic to handle undef"

Browse Source
This commit is contained in:
Zuul
2023-01-09 19:49:48 +00:00
committed by Gerrit Code Review
parent 16aa7716ac dd41ad8a1a
commit 297c7ce33a
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/migration/libvirt.pp
View File

@@ -263,15 +263,8 @@ class nova::migration::libvirt(
if $transport_real == 'tls' { if $transport_real == 'tls' {
$auth_tls_real = $auth $auth_tls_real = $auth
$auth_tcp_real = $::os_service_default $auth_tcp_real = $::os_service_default
$ca_file_real = pick($ca_file, $::os_service_default) $ca_file_real = $ca_file
$crl_file_real = pick($crl_file, $::os_service_default) $crl_file_real = $crl_file
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')
}
} elsif $transport_real == 'tcp' { } elsif $transport_real == 'tcp' {
$auth_tls_real = $::os_service_default $auth_tls_real = $::os_service_default
$auth_tcp_real = $auth $auth_tcp_real = $auth
@@ -284,10 +277,6 @@ class nova::migration::libvirt(
$crl_file_real = $::os_service_default $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 ? { $libvirt_listen_config = $modular_libvirt_real ? {
true => 'virtproxyd_config', true => 'virtproxyd_config',
default => 'libvirtd_config' default => 'libvirtd_config'
@@ -300,7 +289,7 @@ class nova::migration::libvirt(
'auth_tcp' => { 'value' => $auth_tcp_real, 'quote' => true }, 'auth_tcp' => { 'value' => $auth_tcp_real, 'quote' => true },
'ca_file' => { 'value' => $ca_file_real, 'quote' => true }, 'ca_file' => { 'value' => $ca_file_real, 'quote' => true },
'crl_file' => { 'value' => $crl_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' { if $transport_real == 'tls' or $transport_real == 'tcp' {