X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fsource.pp;h=9f31fe91308bbb911b5013a21227b17e4f0e11db;hb=fab62e6de7510c2660c63e385f6553ed69d30e75;hp=ddf753adf101d07cecdb79d8ecff5c72a5e37b6c;hpb=0d32fee292456600f4ad976ed807879463a353c8;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/source.pp b/manifests/source.pp index ddf753a..9f31fe9 100644 --- a/manifests/source.pp +++ b/manifests/source.pp @@ -15,7 +15,6 @@ define apt::source( include apt::params - file { "${name}.list": path => "${apt::params::root}/sources.list.d/${name}.list", ensure => file, @@ -23,6 +22,7 @@ define apt::source( group => root, mode => 644, content => template("apt/source.list.erb"), + } if $pin != false { @@ -36,21 +36,23 @@ define apt::source( } if $required_packages != false { - exec { "${apt::params::provider} -y install ${required_packages}": - subscribe => File["${name}.list"], + exec { "Required packages: '${required_packages}' for ${name}": + command => "${apt::params::provider} -y install ${required_packages}", + subscribe => File["${name}.list"], refreshonly => true, } } if $key != false { if $key_content { - exec { "Add key: ${key} from content": + exec { "Add key: ${key} from content for ${name}": command => "/bin/echo '${key_content}' | /usr/bin/apt-key add -", unless => "/usr/bin/apt-key list | /bin/grep '${key}'", before => File["${name}.list"], } } else { - exec { "/usr/bin/apt-key adv --keyserver ${key_server} --recv-keys ${key}": + exec { "Add key: ${key} from ${key_server} for ${name}": + command => "/usr/bin/apt-key adv --keyserver ${key_server} --recv-keys ${key}", unless => "/usr/bin/apt-key list | /bin/grep ${key}", before => File["${name}.list"], }