From 2211934991158ea66b8d64ac8de4fb8b971f736e Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 1 Feb 2016 11:54:33 +0100 Subject: [refactor] Don't declare dependencies for apt resources The apt module now takes care of all the dependencies removed from `site_apt`. Also, the dependency to install the `lsb` package after `refresh_apt` is unnesseccary because lsb facts won't work anyway on the first run if `lsb` is not installed before, so we can safely remove it. --- puppet/modules/site_apt/manifests/init.pp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'puppet/modules/site_apt') diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index c809a837..fea4b8e7 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -52,13 +52,10 @@ class site_apt { pin => 'origin "deb.leap.se"' } - # All packages should be installed _after_ refresh_apt is called, - # which does an apt-get update. - # There is one exception: - # The creation of sources.list depends on the lsb package +# All packages should be installed _after_ refresh_apt is called, +# which does an apt-get update. + + Exec['refresh_apt'] -> + Package <||> - File['/etc/apt/preferences'] -> - Apt::Preferences_snippet <| |> -> - Exec['refresh_apt'] -> - Package <| ( title != 'lsb' ) |> } -- cgit v1.2.3