openstack
/
puppet-nova
Code Issues Proposed changes

Replace deprecated is_string/is_array method 

Closes-Bug: #1939088
Change-Id: I6caebefef8da76265dca15c01bcbb27af34b6aea
This commit is contained in:
Takashi Kajinami 2021-08-06 10:46:44 +09:00
parent 516d9c1d93
commit 25a5013669
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/compute.pp
View File

@ -485,14 +485,10 @@ Use the same parameter in nova::api class.')
}
}
if !is_service_default($reserved_huge_pages) and !empty($reserved_huge_pages) {
if is_array($reserved_huge_pages) or is_string($reserved_huge_pages) {
$reserved_huge_pages_real = $reserved_huge_pages
} else {
fail("Invalid reserved_huge_pages parameter value: ${reserved_huge_pages}")
}
} else {
$reserved_huge_pages_real = $::os_service_default
$reserved_huge_pages_real = $reserved_huge_pages ? {
String => $reserved_huge_pages,
Array => $reserved_huge_pages,
default => fail("Invalid reserved_huge_pages parameter value: ${reserved_huge_pages}")
}
include nova::availability_zone

2
manifests/scheduler/filter.pp
View File

@ -134,7 +134,7 @@ class nova::scheduler::filter (
$scheduler_enabled_filters_real = $::os_service_default
}
if is_array($scheduler_available_filters) {
if $scheduler_available_filters =~ Array {
if empty($scheduler_available_filters) {
$scheduler_available_filters_real = $::os_service_default
} else {