From e7f8369185f269b58186c7e660fdc8046cc6e74a Mon Sep 17 00:00:00 2001 From: Sergei Gerasenko Date: Thu, 13 Jul 2023 19:01:38 +0000 Subject: [PATCH] Replace all occurences of illegal chars in the name var --- manifests/lvs/real_server.pp | 2 +- manifests/lvs/virtual_server.pp | 2 +- manifests/vrrp/script.pp | 2 +- manifests/vrrp/sync_group.pp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/lvs/real_server.pp b/manifests/lvs/real_server.pp index 08eed89cc5..acc5b6df11 100644 --- a/manifests/lvs/real_server.pp +++ b/manifests/lvs/real_server.pp @@ -30,7 +30,7 @@ Stdlib::Port $port, Keepalived::Options $options = {}, ) { - $_name = regsubst($name, '[:\/\n]', '') + $_name = regsubst($name, '[:\/\n]', '', 'G') concat::fragment { "keepalived.conf_lvs_real_server_${_name}": target => "${keepalived::config_dir}/keepalived.conf", diff --git a/manifests/lvs/virtual_server.pp b/manifests/lvs/virtual_server.pp index e238abed87..ec901bd0c9 100644 --- a/manifests/lvs/virtual_server.pp +++ b/manifests/lvs/virtual_server.pp @@ -99,7 +99,7 @@ Hash $real_server_options = {}, Optional[Stdlib::Fqdn] $virtualhost = undef, ) { - $_name = regsubst($name, '[:\/\n]', '') + $_name = regsubst($name, '[:\/\n]', '', 'G') unless $fwmark { assert_type(Stdlib::Port, $port) diff --git a/manifests/vrrp/script.pp b/manifests/vrrp/script.pp index 013b87a4ea..e7a80b814b 100644 --- a/manifests/vrrp/script.pp +++ b/manifests/vrrp/script.pp @@ -32,7 +32,7 @@ $no_weight = false, $init_fail = false, ) { - $_name = regsubst($name, '[:\/\n]', '') + $_name = regsubst($name, '[:\/\n]', '', 'G') if ! $weight { $weight_real = 2 diff --git a/manifests/vrrp/sync_group.pp b/manifests/vrrp/sync_group.pp index ee011c1a25..ceaa16cbe0 100644 --- a/manifests/vrrp/sync_group.pp +++ b/manifests/vrrp/sync_group.pp @@ -45,7 +45,7 @@ Boolean $global_tracking = false, Optional[Variant[String, Array[String]]] $track_interface = undef, ) { - $_name = regsubst($name, '[:\/\n]', '') + $_name = regsubst($name, '[:\/\n]', '', 'G') concat::fragment { "keepalived.conf_vrrp_sync_group_${_name}": target => "${keepalived::config_dir}/keepalived.conf",