Merge branch '0.7.0' into develop

1 files changed, 9 insertions, 1 deletions

diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index c32c29c4..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')
@@ -31,12 +32,19 @@ class site_apt {
     priority => 999
   }
 
+  apt::preferences_snippet { 'leap':
+    priority => 999,
+    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' ) |>
 }