Merge "Replace the deprecated is_ipv6_address function"

This commit is contained in:
Zuul 2021-11-10 23:30:05 +00:00 committed by Gerrit Code Review
commit a9a89ec690
1 changed files with 2 additions and 2 deletions

View File

@ -133,8 +133,8 @@ define pacemaker::resource::ip(
$location_rule = undef,
$deep_compare = hiera('pacemaker::resource::ip::deep_compare', false),
$update_settle_secs = hiera('pacemaker::resource::ip::update_settle_secs', 600),
) {
if !is_ipv6_address($ip_address) and $ipv6_addrlabel != '' {
) {
if !($ip_address =~ Stdlib::Compat::Ipv6) and $ipv6_addrlabel != '' {
fail("ipv6_addrlabel ${ipv6_addrlabel} was specified, but ${ip_address} is not an ipv6 address")
}