X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fppa.pp;h=095d8f17b2b86d6318ca3ab24586ad90d314458a;hb=d1e0e3ee37899edafa1485dde256d61267c484b9;hp=9c277e9bd4534ec35d7859a17706e5a1616f2ec4;hpb=ed2d19e2f3aa025871ec8334d48db53b800a91f2;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 9c277e9..095d8f1 100644
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,18 +1,36 @@
 # ppa.pp
 
 define apt::ppa(
-
+  $release = $lsbdistcodename
 ) {
-    require apt
 
-    exec { "apt-update-${name}":
-        command     => "/usr/bin/aptitude update",
-        refreshonly => true,
-    }
+  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}"];
+  }
 
-    exec { "add-apt-repository-${name}":
-        command => "/usr/bin/add-apt-repository ${name}",
-        notify  => Exec["apt-update-${name}"],
-    }
 }