From b6e9b3eb13d6fb720c3fd133fde0f0c80e3a96f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Wed, 22 Nov 2023 16:35:11 -1000 Subject: [PATCH] Remove legacy top-scope syntax --- manifests/deep_merge.pp | 2 +- manifests/eyaml.pp | 2 +- manifests/eyaml_gpg.pp | 4 ++-- spec/defines/install_spec.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/deep_merge.pp b/manifests/deep_merge.pp index 4a3c318..6741d5e 100644 --- a/manifests/deep_merge.pp +++ b/manifests/deep_merge.pp @@ -18,7 +18,7 @@ $manage_package = $hiera::manage_deep_merge_package if $manage_package { - ::hiera::install { 'deep_merge': + hiera::install { 'deep_merge': gem_name => $deep_merge_name, provider => $provider, gem_version => $deep_merge_version, diff --git a/manifests/eyaml.pp b/manifests/eyaml.pp index 1a103ef..3766ccc 100644 --- a/manifests/eyaml.pp +++ b/manifests/eyaml.pp @@ -26,7 +26,7 @@ $manage_package = $hiera::manage_eyaml_package if $manage_package { - ::hiera::install { 'eyaml': + hiera::install { 'eyaml': gem_name => $eyaml_name, provider => $provider, gem_version => $eyaml_version, diff --git a/manifests/eyaml_gpg.pp b/manifests/eyaml_gpg.pp index 7eb85c5..0bb778a 100644 --- a/manifests/eyaml_gpg.pp +++ b/manifests/eyaml_gpg.pp @@ -28,13 +28,13 @@ } if $manage_package { - ::hiera::install { 'ruby_gpg': + hiera::install { 'ruby_gpg': gem_name => $ruby_gpg_name, provider => $provider, gem_version => $ruby_gpg_version, gem_source => $ruby_gpg_source, } - -> ::hiera::install { 'hiera-eyaml-gpg': + -> hiera::install { 'hiera-eyaml-gpg': gem_name => $eyaml_gpg_name, provider => $provider, gem_version => $eyaml_gpg_version, diff --git a/spec/defines/install_spec.rb b/spec/defines/install_spec.rb index a849711..388d6f4 100644 --- a/spec/defines/install_spec.rb +++ b/spec/defines/install_spec.rb @@ -10,7 +10,7 @@ end let :pre_condition do [ - 'include ::hiera' + 'include hiera' ] end