From 39b822e1b5d82694f4ddbeab06956cfeec3ce4b0 Mon Sep 17 00:00:00 2001 From: Ramesh Sencha Date: Thu, 6 Jul 2023 12:10:07 +0530 Subject: [PATCH] (CONT-1196) - Remove deprecated function merge --- manifests/install.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/install.pp b/manifests/install.pp index dd541bc5..82e3fc09 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -52,19 +52,19 @@ } case $docker::package_source { /docker-engine/ : { - ensure_resource('package', 'docker', merge($docker_hash, { + ensure_resource('package', 'docker', stdlib::merge($docker_hash, { ensure => $ensure, source => $docker::package_source, name => $docker::docker_engine_package_name, })) } /docker-ce/ : { - ensure_resource('package', 'docker', merge($docker_hash, { + ensure_resource('package', 'docker', stdlib::merge($docker_hash, { ensure => $ensure, source => $docker::package_source, name => $docker::docker_ce_package_name, })) - ensure_resource('package', 'docker-ce-cli', merge($docker_hash, { + ensure_resource('package', 'docker-ce-cli', stdlib::merge($docker_hash, { ensure => $ensure, source => $docker::package_source, name => $docker::docker_ce_cli_package_name, @@ -76,7 +76,7 @@ } } else { if $facts['os']['family'] != 'windows' { - ensure_resource('package', 'docker', merge($docker_hash, { + ensure_resource('package', 'docker', stdlib::merge($docker_hash, { ensure => $ensure, name => $docker::docker_package_name, }))