diff --git a/lib/puppet/parser/functions/docker_run_flags.rb b/lib/puppet/parser/functions/docker_run_flags.rb index 0bab3976..f075efd1 100644 --- a/lib/puppet/parser/functions/docker_run_flags.rb +++ b/lib/puppet/parser/functions/docker_run_flags.rb @@ -8,9 +8,9 @@ module Puppet::Parser::Functions subject = args[0] escape_function = if self['facts'] && self['facts']['os']['family'] == 'windows' - 'powershell_escape' + 'stdlib::powershell_escape' else - 'shell_escape' + 'stdlib::shell_escape' end call_function(escape_function, subject) diff --git a/manifests/compose.pp b/manifests/compose.pp index e92425f5..302b4539 100644 --- a/manifests/compose.pp +++ b/manifests/compose.pp @@ -37,7 +37,7 @@ Optional[String] $version = $docker::params::compose_version, Optional[String] $install_path = $docker::params::compose_install_path, Optional[String] $symlink_name = $docker::params::compose_symlink_name, - Optional[Pattern['^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$']] $proxy = undef, + Optional[Pattern['^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$']] $proxy = undef, Optional[String] $base_url = $docker::params::compose_base_url, Optional[String] $raw_url = undef, Optional[Boolean] $curl_ensure = $docker::params::curl_ensure, @@ -82,7 +82,7 @@ } } else { if $curl_ensure { - ensure_packages(['curl']) + stdlib::ensure_packages(['curl']) } exec { "Install Docker Compose ${version}": diff --git a/manifests/machine.pp b/manifests/machine.pp index 65d728a7..0f3f50c2 100644 --- a/manifests/machine.pp +++ b/manifests/machine.pp @@ -24,7 +24,7 @@ Enum[present,absent] $ensure = 'present', Optional[String] $version = $docker::params::machine_version, Optional[String] $install_path = $docker::params::machine_install_path, - Optional[Pattern['^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$']] $proxy = undef, + Optional[Pattern['^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$']] $proxy = undef, Optional[Variant[Stdlib::HTTPUrl, Stdlib::HTTPSUrl]] $url = undef, Optional[Boolean] $curl_ensure = $docker::params::curl_ensure, ) inherits docker::params { @@ -67,7 +67,7 @@ } } else { if $curl_ensure { - ensure_packages(['curl']) + stdlib::ensure_packages(['curl']) } exec { "Install Docker Machine ${version}": diff --git a/manifests/repos.pp b/manifests/repos.pp index 2e27614a..b6c6a7a3 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -14,7 +14,7 @@ Optional[Boolean] $key_check_source = $docker::package_key_check_source, String $architecture = $facts['os']['architecture'], ) { - ensure_packages($docker::prerequired_packages) + stdlib::ensure_packages($docker::prerequired_packages) case $facts['os']['family'] { 'Debian': { diff --git a/metadata.json b/metadata.json index df2caa31..55e81998 100644 --- a/metadata.json +++ b/metadata.json @@ -10,7 +10,7 @@ "dependencies": [ { "name": "puppetlabs/stdlib", - "version_requirement": ">= 8.2.0 < 9.0.0" + "version_requirement": ">= 9.0.0 < 10.0.0" }, { "name": "puppetlabs/apt",