diff options
| author | varac <varacanero@zeromail.org> | 2016-02-01 11:54:33 +0100 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2016-02-02 19:38:35 +0100 |
| commit | 2211934991158ea66b8d64ac8de4fb8b971f736e (patch) | |
| tree | 8f4bf42092a6e8642e5e87162977e58789cd2973 /puppet/modules/site_apt | |
| parent | 3dabb02d43f2a65890085734032c9678dee5b830 (diff) | |
[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.
Diffstat (limited to 'puppet/modules/site_apt')
| -rw-r--r-- | puppet/modules/site_apt/manifests/init.pp | 13 |
1 files changed, 5 insertions, 8 deletions
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' ) |> } |