From d6b064672d49e421e34f2165513178ffa7cee8ab Mon Sep 17 00:00:00 2001 From: Micah Date: Thu, 14 Jul 2016 11:04:19 -0400 Subject: Only use the 'main' repository for apt (#8253) Change-Id: If39222dc9ec68d1786c70c4b82b740e0a06773c4 --- puppet/modules/site_apt/manifests/init.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'puppet/modules/site_apt') 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 -- cgit v1.2.3 From dadac49e55f19e7ac814ae798dcfb87fddbef0ba Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 29 Aug 2016 18:31:42 +0200 Subject: [feat] Use twisted 16.2 from jessie-backports New soledad packages now depend on Twisted 16.2.0 (see https://leap.se/code/issues/8412), so we need to pin twisted to get installed from jessie-backports. - Resolves: #8418 --- puppet/modules/site_apt/manifests/preferences/twisted.pp | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 puppet/modules/site_apt/manifests/preferences/twisted.pp (limited to 'puppet/modules/site_apt') 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; + } + +} -- cgit v1.2.3