On armhf, schroot* from buildd.d.o gets a pin-priority of 700

diff --git a/modules/buildd/files/apt-preferences b/modules/buildd/files/apt-preferences
deleted file mode 100644 (file)
index db8dd1f..0000000
--- a/modules/buildd/files/apt-preferences
+++ /dev/null
@@ -1,7 +0,0 @@
-Package: schroot
-Pin: release o=buildd.debian.org
-Pin-Priority: 500
-
-Package: schroot-common
-Pin: release o=buildd.debian.org
-Pin-Priority: 500

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 009d99313b2db37c31c12af1dfc653fdbd7dceae..2248409ddaaae1115a7479fe14d18aca048166c6 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -41,7 +41,11 @@ class buildd {
        }
 
        file { '/etc/apt/preferences.d/buildd':
+               ensure => absent,
+       }
+       file { '/etc/apt/preferences.d/buildd.debian.org':
                source  => "puppet:///modules/buildd/apt-preferences",
+               content => template('buildd/etc/apt/preferences.d/buildd.debian.org'),
                before  => File["/etc/apt/sources.list.d/buildd.list"],
                ;
        }

diff --git a/modules/buildd/templates/etc/apt/preferences.d/buildd.debian.org b/modules/buildd/templates/etc/apt/preferences.d/buildd.debian.org
new file mode 100644 (file)
index 0000000..4be1d8e
--- /dev/null
+++ b/modules/buildd/templates/etc/apt/preferences.d/buildd.debian.org
@@ -0,0 +1,17 @@
+<% if scope.lookupvar('site::nodeinfo')['ldap'].has_key?('architecture') and scope.lookupvar('site::nodeinfo')['ldap']['architecture'][0] == 'armhf' -%>
+Package: schroot
+Pin: release o=buildd.debian.org
+Pin-Priority: 700
+
+Package: schroot-common
+Pin: release o=buildd.debian.org
+Pin-Priority: 700
+<% else -%>
+Package: schroot
+Pin: release o=buildd.debian.org
+Pin-Priority: 500
+
+Package: schroot-common
+Pin: release o=buildd.debian.org
+Pin-Priority: 500
+<% end %>