Merge pull request #426 from puppetlabs/daenney/fix-missing-param-and-naming

apt::params: Add two missing entries, use them.

diff --git a/manifests/source.pp b/manifests/source.pp
index 3e9414f11db8121fccae496092455512565a32e0..b06d6101b1d4eb058881e4bc1f11dcb7a7541c9c 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -9,7 +9,6 @@ define apt::source(
   $repos             = 'main',
   $include_src       = true,
   $include_deb       = true,
-  $required_packages = false,
   $key               = undef,
   $key_server        = 'keyserver.ubuntu.com',
   $key_content       = undef,
@@ -60,18 +59,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}":

diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
index 5095904ac4a92352d58458addeaeae9030516e65..b92f7ddabc3c60e136739a0b42f2aa44c000cde3 100644 (file)
--- a/spec/classes/apt_spec.rb
+++ b/spec/classes/apt_spec.rb
@@ -96,7 +96,6 @@ describe 'apt', :type => :class do
         'location'          => 'http://debian.mirror.iweb.ca/debian/',
         'release'           => 'unstable',
         'repos'             => 'main contrib non-free',
-        'required_packages' => 'debian-keyring debian-archive-keyring',
         'key'               => '55BE302B',
         'key_server'        => 'subkeys.pgp.net',
         'pin'               => '-10',

diff --git a/spec/defines/source_spec.rb b/spec/defines/source_spec.rb
index 684a6f06561da45a2751b9694b4580e78f632821..7a1cac321a0502471dfef8a8497e0d4b5f250c88 100644 (file)
--- a/spec/defines/source_spec.rb
+++ b/spec/defines/source_spec.rb
@@ -51,7 +51,6 @@ describe 'apt::source', :type => :define do
         'release'           => 'sid',
         'repos'             => 'testing',
         'include_src'       => false,
-        'required_packages' => 'vim',
         'key'               => GPG_KEY_ID,
         'key_server'        => 'pgp.mit.edu',
         'key_content'       => 'GPG key content',
@@ -78,15 +77,6 @@ describe 'apt::source', :type => :define do
     })
     }
 
-    it { is_expected.to contain_exec("Required packages: 'vim' for my_source").that_comes_before('Exec[apt_update]').that_subscribes_to('File[my_source.list]').with({
-      'command'     => '/usr/bin/apt-get -y install vim',
-      'logoutput'   => 'on_failure',
-      'refreshonly' => true,
-      'tries'       => '3',
-      'try_sleep'   => '1',
-    })
-    }
-
     it { is_expected.to contain_apt__key("Add key: #{GPG_KEY_ID} from Apt::Source my_source").that_comes_before('File[my_source.list]').with({
       'ensure' => 'present',
         'key'  => GPG_KEY_ID,