X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fppa.pp;h=725170d2dc39dfb9c8b51841b795a8d467cb480c;hb=1b07921c0c59dcf77987ac29c21d9909dfdb38f5;hp=9527e0d624d3113fa0f72a20d55e5364c3e6a4c2;hpb=9d208034577f49fcfe71d9d142e36245d257773e;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 9527e0d..725170d 100644
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -17,16 +17,23 @@ define apt::ppa(
   $filename_without_ppa     = regsubst($filename_without_dots, '^ppa:', '', G)
   $sources_list_d_filename  = "${filename_without_ppa}-${release}.list"
 
-  if ! defined(Package['python-software-properties']) {
-    package { 'python-software-properties': }
+  $package = $::lsbdistrelease ? {
+    /^[1-9]\..*|1[01]\..*|12.04$/ => 'python-software-properties',
+    default  => 'software-properties-common',
+  }
+
+  if ! defined(Package[$package]) {
+    package { $package: }
   }
 
   exec { "add-apt-repository-${name}":
     command   => "/usr/bin/add-apt-repository ${name}",
     creates   => "${sources_list_d}/${sources_list_d_filename}",
     logoutput => 'on_failure',
-    require   => [ File[$sources_list_d],
-                   Package['python-software-properties'] ],
+    require   => [
+      File[$sources_list_d],
+      Package["${package}"],
+    ],
     notify    => Exec['apt_update'],
   }
 
@@ -40,4 +47,3 @@ define apt::ppa(
     require => Class['apt::update'],
   }
 }
-