From 4e7c58c07b3d50d369f92fb729ac0737363d6aea Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 20 Nov 2017 10:38:46 +0100 Subject: [PATCH] replace topscope variables with facts hash --- README.md | 2 +- manifests/plugin/perl/plugin.pp | 2 +- manifests/plugin/rabbitmq.pp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9fcc4e57b..942cf361d 100644 --- a/README.md +++ b/README.md @@ -1460,7 +1460,7 @@ class { '::collectd::plugin::rabbitmq': 'Password' => $admin_pass, 'Scheme' => 'https', 'Port' => '15671', - 'Host' => $::fqdn, + 'Host' => $facts['fqdn'], 'Realm' => '"RabbitMQ Management"', }, } diff --git a/manifests/plugin/perl/plugin.pp b/manifests/plugin/perl/plugin.pp index 9bc608c65..cb3652860 100644 --- a/manifests/plugin/perl/plugin.pp +++ b/manifests/plugin/perl/plugin.pp @@ -68,7 +68,7 @@ $include_dirs_prefixed = prefix($include_dirs, '-I') $include_dirs_prefixed_joined = join($include_dirs_prefixed,' ') exec { "perl ${include_dirs_prefixed_joined} -e 'my\$m=shift;eval\"use \$m\";exit!exists\$INC{\$m=~s!::!/!gr.\".pm\"}' ${module}": - path => $::path, + path => $facts['path'], } } default: { diff --git a/manifests/plugin/rabbitmq.pp b/manifests/plugin/rabbitmq.pp index 1d93d4a97..9cdd5b5d1 100644 --- a/manifests/plugin/rabbitmq.pp +++ b/manifests/plugin/rabbitmq.pp @@ -36,7 +36,7 @@ # 'Password' => 'guest_pass', # 'Scheme' => 'http', # 'Port' => '15672', -# 'Host' => $::fqdn, +# 'Host' => $facts['fqdn'], # 'Realm' => '"RabbitMQ Management"', # } # @@ -47,7 +47,7 @@ 'Password' => 'guest', 'Scheme' => 'http', 'Port' => '15672', - 'Host' => $::fqdn, + 'Host' => $facts['fqdn'], 'Realm' => '"RabbitMQ Management"', }, # lint:endignore