X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=3636c7367a35fa31d3f3e8a8e45723331b576c50;hb=e21a95b8fc59f96985dd1f16a5b450a637a73cca;hp=714127e2c432e46f6d5974f2fae92e8858174a79;hpb=c9c9427c9d5b8218e6ae119d4e5b3ea5fc0e174a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 714127e2c..3636c7367 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -48,6 +48,7 @@ class debian-org {
         "dsa-munin-plugins": ensure => installed;
         "klogd": ensure => purged;
         "less": ensure => installed;
+        "lsb-release": ensure => installed;
         "libfilesystem-ruby1.8": ensure => installed;
         "mtr-tiny": ensure => installed;
         "nload": ensure => installed;
@@ -65,6 +66,9 @@ class debian-org {
                 "/etc/apt/sources.list.d/backports.org.list":
                     content => template("debian-org/etc/apt/sources.list.d/backports.org.list.erb"),
                     notify  => Exec["apt-get update"];
+                "/etc/apt/sources.list.d/volatile.list":
+                    content => template("debian-org/etc/apt/sources.list.d/volatile.list.erb"),
+                    notify  => Exec["apt-get update"];
             }
         }
     }
@@ -74,9 +78,6 @@ class debian-org {
         "/etc/apt/sources.list.d/debian.org.list":
             content => template("debian-org/etc/apt/sources.list.d/debian.org.list.erb"),
             notify  => Exec["apt-get update"];
-        "/etc/apt/sources.list.d/volatile.list":
-            content => template("debian-org/etc/apt/sources.list.d/volatile.list.erb"),
-            notify  => Exec["apt-get update"];
         "/etc/apt/apt.conf.d/local-recommends":
             source => "puppet:///modules/debian-org/apt.conf.d/local-recommends";
         "/etc/apt/apt.conf.d/local-pdiffs":
@@ -168,9 +169,8 @@ class debian-proliant inherits debian-org {
         "hp-health": ensure => installed;
         "arrayprobe": ensure => installed;
     }
-    case getfromhash($nodeinfo, 'squeeze') {
-        true: {}
-        default: {
+    case $lsbdistcodename {
+        'lenny':    {
             package {
                 "cpqarrayd": ensure => installed;
             }