summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-06-06 15:38:52 +0200
committervarac <varacanero@zeromail.org>2015-06-06 15:38:52 +0200
commit251178948efda3cf15b6f64af57d6d594f31695e (patch)
tree1d9ab32f36b157dec7aebbfe66419a775b41bf43 /puppet
parent40e53a905a6b7de338d3ff11d8a688b086870073 (diff)
Configure apt preferences before installing any packages
Change-Id: Iac4dc8428ff5e663870ed4dd6a2b840e0904e5be
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_apt/manifests/init.pp6
1 files changed, 4 insertions, 2 deletions
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index 02f85140..cf49f870 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -1,3 +1,4 @@
+# setup apt on all nodes
class site_apt {
$sources = hiera('sources')
@@ -36,13 +37,14 @@ class site_apt {
package => '*',
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
File['/etc/apt/preferences'] ->
+ Apt::Preferences_snippet <| |> ->
Exec['refresh_apt'] ->
- Package <| ( title != 'lsb' ) |>
+ Package <| ( title != 'lsb' ) |>
}