X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fppa.pp;h=712f425f49b5b50c3de6f74fb639b8088af41ef3;hb=44fd06c4a47d8e75fa659fdcdabf20e912195496;hp=51959cfbf27765a8a21619d25d16d0e7f3490fa4;hpb=71fc4251767bc4784769aead6a6273250359dbe2;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/ppa.pp b/manifests/ppa.pp index 51959cf..712f425 100644 --- a/manifests/ppa.pp +++ b/manifests/ppa.pp @@ -1,13 +1,36 @@ # ppa.pp define apt::ppa( - + $release = $lsbdistcodename ) { - include apt - exec { "/usr/bin/add-apt-repository ${name}": - require => Package["python-software-properties"], - # TODO: unless => 'check' - } + Class['apt'] -> Apt::Ppa[$title] + + include apt::params + + if ! $release { + fail("lsbdistcodename fact not available: release parameter required") + } + + exec { "apt-update-${name}": + command => "/usr/bin/aptitude update", + refreshonly => true, + } + + $filename_without_slashes = regsubst($name,'/','-','G') + $filename_without_ppa = regsubst($filename_without_slashes, '^ppa:','','G') + $sources_list_d_filename = "${filename_without_ppa}-${release}.list" + + exec { "add-apt-repository-${name}": + command => "/usr/bin/add-apt-repository ${name}", + notify => Exec["apt-update-${name}"], + creates => "${apt::params::sources_list_d}/${sources_list_d_filename}", + } + + file { "${apt::params::sources_list_d}/${sources_list_d_filename}": + ensure => file, + require => Exec["add-apt-repository-${name}"]; + } + }