Merge pull request #428 from puppetlabs/daenney/apt-setting

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

diff --git a/manifests/source.pp b/manifests/source.pp
index 259d0ebb98993d26eacd83ce9db9cce2ac9012b3..d145918223df02bfc1e3ee52985698edc976a53d 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -9,17 +9,16 @@ define apt::source(
   $repos             = 'main',
   $include_src       = true,
   $include_deb       = true,
-  $required_packages = false,
   $key               = undef,
   $key_server        = 'keyserver.ubuntu.com',
   $key_content       = undef,
   $key_source        = undef,
   $pin               = false,
-  $architecture      = undef
+  $architecture      = undef,
+  $trusted_source    = false,
 ) {
-
-  include apt::params
-  include apt::update
+  validate_string($architecture)
+  validate_bool($trusted_source)
 
   $sources_list_d = $apt::params::sources_list_d
   $provider       = $apt::params::provider
@@ -40,7 +39,7 @@ define apt::source(
     owner   => root,
     group   => root,
     mode    => '0644',
-    content => template("${module_name}/source.list.erb"),
+    content => template('apt/_header.erb', 'apt/source.list.erb'),
     notify  => Exec['apt_update'],
   }
 
@@ -58,18 +57,6 @@ define apt::source(
     }
   }
 
-  if ($required_packages != false) and ($ensure == 'present') {
-    exec { "Required packages: '${required_packages}' for ${name}":
-      command     => "${provider} -y install ${required_packages}",
-      logoutput   => 'on_failure',
-      refreshonly => true,
-      tries       => 3,
-      try_sleep   => 1,
-      subscribe   => File["${name}.list"],
-      before      => Exec['apt_update'],
-    }
-  }
-
   # We do not want to remove keys when the source is absent.
   if $key and ($ensure == 'present') {
     apt::key { "Add key: ${key} from Apt::Source ${title}":