diff --git a/manifests/storage/server.pp b/manifests/storage/server.pp index 3b04e595..36d5a206 100644 --- a/manifests/storage/server.pp +++ b/manifests/storage/server.pp @@ -636,7 +636,7 @@ define swift::storage::server( } } - create_resources("swift_${type}_config", merge( + create_resources("swift_${type}_config", stdlib::merge( $common_opts, $log_statsd_opts, $type_opts, diff --git a/manifests/xfs.pp b/manifests/xfs.pp index aa8391c5..83714b49 100644 --- a/manifests/xfs.pp +++ b/manifests/xfs.pp @@ -6,6 +6,6 @@ class swift::xfs { include swift::deps $packages = ['xfsprogs', 'parted'] - ensure_packages($packages) + stdlib::ensure_packages($packages) } diff --git a/metadata.json b/metadata.json index e45a7db6..112817c6 100644 --- a/metadata.json +++ b/metadata.json @@ -23,7 +23,7 @@ }, { "name": "puppetlabs/stdlib", - "version_requirement": ">=5.0.0 <10.0.0" + "version_requirement": ">=9.0.0 <10.0.0" }, { "name": "puppetlabs/xinetd",