openstack
/
puppet-swift
Code Issues Proposed changes

Merge "Replace deprecated is_array method"

This commit is contained in:
Zuul 2021-08-10 08:14:04 +00:00 committed by Gerrit Code Review
parent fcd75cfed3 7d7d8679d6
commit 3232c2b07f
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/proxy/domain_remap.pp
View File

@ -82,11 +82,7 @@ class swift::proxy::domain_remap(
include swift::deps
if !is_service_default($reseller_prefixes) and is_array($reseller_prefixes) {
$reseller_prefixes_str = join($reseller_prefixes, ',')
} else {
$reseller_prefixes_str = $reseller_prefixes
}
$reseller_prefixes_real = join(any2array($reseller_prefixes), ',')
swift_proxy_config {
'filter:domain_remap/use': value => 'egg:swift#domain_remap';
@ -97,7 +93,7 @@ class swift::proxy::domain_remap(
'filter:domain_remap/set log_address': value => $log_address;
'filter:domain_remap/storage_domain' : value => $storage_domain;
'filter:domain_remap/path_root': value => $path_root;
'filter:domain_remap/reseller_prefixes': value => $reseller_prefixes_str;
'filter:domain_remap/reseller_prefixes': value => $reseller_prefixes_real;
'filter:domain_remap/default_reseller_prefix': value => $default_reseller_prefix;
'filter:domain_remap/mangle_client_paths': value => $mangle_client_paths;
}

7
manifests/storage/server.pp
View File

@ -226,11 +226,8 @@ define swift::storage::server(
}
# Warn if ${type-server} isn't included in the pipeline
if is_array($pipeline) {
if !member($pipeline, "${type}-server") {
warning("swift storage server ${type} must specify ${type}-server")
}
} elsif $pipeline != "${type}-server" {
$pipeline_array = any2array($pipeline)
if !member($pipeline_array, "${type}-server") {
warning("swift storage server ${type} must specify ${type}-server")
}