Merge branch 'develop'

2 files changed, 13 insertions, 1 deletions

diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index 455425c1..26bd2c6a 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -25,7 +25,8 @@ class site_apt {
     debian_url       => $apt_url_basic,
     security_url     => $apt_url_security,
     backports_url    => $apt_url_backports,
-    use_next_release => $use_next_release
+    use_next_release => $use_next_release,
+    repos            => 'main'
   }
 
   # enable http://deb.leap.se debian package repository
diff --git a/puppet/modules/site_apt/manifests/preferences/twisted.pp b/puppet/modules/site_apt/manifests/preferences/twisted.pp
new file mode 100644
index 00000000..a3fa0950
--- /dev/null
+++ b/puppet/modules/site_apt/manifests/preferences/twisted.pp
@@ -0,0 +1,11 @@
+# Pin twisted to jessie-backports in order to
+# use 16.2.0 for i.e. soledad
+class site_apt::preferences::twisted {
+
+  apt::preferences_snippet { 'twisted':
+    package  => 'python-twisted*',
+    release  => "${::lsbdistcodename}-backports",
+    priority => 999;
+  }
+
+}