diff options
author | varac <varacanero@zeromail.org> | 2016-02-02 16:38:28 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2016-02-02 16:38:28 +0100 |
commit | 572b02679a030a2df154e86dd9c4a18e2af988d2 (patch) | |
tree | fc52b9842bd95a35a00d2e8a209d773865629921 /puppet/modules/site_apt/manifests/init.pp | |
parent | edc9aa13f5ebb07f27e73fd4befc5fbbadfebc66 (diff) | |
parent | 9278d76636fcffa624528b1fb11a7197f9f6b27c (diff) |
Merge branch '7844_fix_deploy_on_plain_node' into develop
Diffstat (limited to 'puppet/modules/site_apt/manifests/init.pp')
-rw-r--r-- | puppet/modules/site_apt/manifests/init.pp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index c809a837..447e1781 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -52,13 +52,8 @@ 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 'update_apt' is called, + # which does an 'apt-get update'. + Exec['update_apt'] -> Package <||> - File['/etc/apt/preferences'] -> - Apt::Preferences_snippet <| |> -> - Exec['refresh_apt'] -> - Package <| ( title != 'lsb' ) |> } |