From afa7e2b4262ce897bff6a65de77797f36e06f592 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 8 Jul 2022 14:14:57 +0900 Subject: [PATCH] Fix deprecation warning by validate_legacy Currently the swift::storage::node defined type shows the warning message below, followed by huge call trace log, when zone parameter is set by a string value. ~~~ Warning: validate_legacy(validate_re) expects an Integer value, got String at ... ~~~ This change fixes usage of the validate_legacy function to avoid that warning. Change-Id: Ic9ca9fb952e4a678deeb1b8e04c09ba620b8ae20 (cherry picked from commit 4be2336843bf293d44bf8aa9bf9a5b5af583797c) --- manifests/storage/node.pp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/manifests/storage/node.pp b/manifests/storage/node.pp index 90275333..87ad68ac 100644 --- a/manifests/storage/node.pp +++ b/manifests/storage/node.pp @@ -54,8 +54,10 @@ define swift::storage::node( include swift::deps - validate_legacy(Integer, 'validate_re', $zone, - ['^\d+$', 'The zone parameter must be an integer']) + if ! $zone =~ Integer { + validate_legacy(Pattern[/^\d+$/], 'validate_re', $zone, + ['^\d+$', 'The zone parameter must be an integer']) + } Swift::Storage::Server { storage_local_net_ip => $storage_local_net_ip,