X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fppa.pp;h=c0dfaa0f8212b78f46720540cdebe4240c9d5423;hb=669f5b51fb429fb29e0b5698fa4dadd74ac74cfb;hp=75f0a69574368316f4540567d00b92383645391b;hpb=627718fd34e6610979edf0d36081678b80a390fd;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 75f0a69..c0dfaa0 100644
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,13 +1,34 @@
 # 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
+  include apt::update
+
+  $sources_list_d = $apt::params::sources_list_d
+
+  if ! $release {
+    fail('lsbdistcodename fact not available: release parameter required')
+  }
+
+
+  $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}",
+    creates => "${sources_list_d}/${sources_list_d_filename}",
+    notify  => Exec['apt_update'],
+  }
+
+  file { "${sources_list_d}/${sources_list_d_filename}":
+    ensure  => file,
+    require => Exec["add-apt-repository-${name}"];
+  }
 }