Move Package['python-software-properties'] to apt:ppa

[puppet-modules/puppetlabs-apt.git] / manifests / init.pp

diff --git a/manifests/init.pp b/manifests/init.pp
index ce88c3bd83814f575399972fa573463179ad1a77..e41cd3fdee7514b6373603d917638e3a77dbd28e 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -33,17 +33,13 @@ class apt(
 
   validate_bool($purge_sources_list, $purge_sources_list_d)
 
-  if ! defined(Package['python-software-properties']) {
-    package { 'python-software-properties': }
-  }
-
   $sources_list_content = $purge_sources_list ? {
     false => undef,
     true  => "# Repos managed by puppet.\n",
   }
 
   if $always_apt_update == true {
-    Exec <| title=='apt update' |> {
+    Exec <| title=='apt_update' |> {
       refreshonly => false,
     }
   }
@@ -60,7 +56,7 @@ class apt(
     group   => root,
     mode    => '0644',
     content => $sources_list_content,
-    notify  => Exec['apt update'],
+    notify  => Exec['apt_update'],
   }
 
   file { 'sources.list.d':
@@ -70,7 +66,7 @@ class apt(
     group   => root,
     purge   => $purge_sources_list_d,
     recurse => $purge_sources_list_d,
-    notify  => Exec['apt update'],
+    notify  => Exec['apt_update'],
   }
 
   case $disable_keys {
@@ -95,7 +91,7 @@ class apt(
     file { 'configure-apt-proxy':
       path    => "${apt_conf_d}/proxy",
       content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";",
-      notify  => Exec['apt update'],
+      notify  => Exec['apt_update'],
     }
   }
 }