diff --git a/manifests/init.pp b/manifests/init.pp index c525619f..bf5c05aa 100755 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -441,7 +441,7 @@ Array $daemon_environment_files = [], Variant[String,Hash,Undef] $repo_opt = $docker::params::repo_opt, Boolean $nowarn_kernel = $docker::params::nowarn_kernel, - Optional[String] $os = $docker::params::os, + Optional[String] $os_lc = $docker::params::os_lc, Optional[String] $storage_devs = $docker::params::storage_devs, Optional[String] $storage_vg = $docker::params::storage_vg, Optional[String] $storage_root_size = $docker::params::storage_root_size, diff --git a/manifests/params.pp b/manifests/params.pp index 223ad102..5a2c2806 100755 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -85,7 +85,7 @@ $registry_mirror = undef $compose_version = '1.9.0' $compose_install_path = '/usr/local/bin' - $os = downcase($::operatingsystem) + $os_lc = downcase($::operatingsystem) case $::osfamily { 'Debian' : { @@ -142,8 +142,8 @@ $service_config = undef $storage_setup_file = undef - $package_ce_source_location = "https://download.docker.com/linux/${os}" - $package_ce_key_source = "https://download.docker.com/linux/${os}/gpg" + $package_ce_source_location = "https://download.docker.com/linux/${os_lc}" + $package_ce_key_source = "https://download.docker.com/linux/${os_lc}/gpg" $package_ce_key_id = '9DC858229FC7DD38854AE2D88D81803C0EBFCD88' $package_ce_release = $::lsbdistcodename $package_source_location = 'http://apt.dockerproject.org/repo'