stop making all that noise

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 369aade3d941d7f40fcdbf05fee431ed87d9a3df..9654de9fccb0d4caa48625aef8736a3d0076a598 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -68,6 +68,7 @@ class debian-org {
                        template => 'debian-org/etc/apt/sources.list.d/backports.debian.org.list.erb',
                }
                site::aptrepo { 'volatile':
+                       noop     => true,
                        template => 'debian-org/etc/apt/sources.list.d/volatile.list.erb',
                }
        }

diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb
index 31019200c89a74c306f75baf0b8a95776bf221d4..af8fcb9c166d273c93fbfdcaa8197a0504b9f650 100644 (file)
--- a/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb
+++ b/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb
@@ -3,8 +3,6 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<% if lsbdistcodename == 'lenny' %>
-deb     http://volatile.debian.org/debian-volatile lenny/volatile   main contrib non-free
-<% elsif lsbdistcodename != 'n/a' %>
+<% unless %w{lenny n/a}.include?(scope.lookupvar('::lsbdistcodename')) %>
 deb    http://ftp.debian.org/debian    <%= lsbdistcodename %>-updates          main contrib non-free
 <% end %>