Revert "Revert "now make it go away""

This reverts commit 6472d1591bd84323a79e43dff6bcf7e044f62bc8.

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 3a9d5087aa50b6d306cc038340f6b9b7a1605789..87ea915c98715225f56f60e84f42f9889ed3bdc8 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,21 +1,26 @@
-class buildd {
+class buildd ($ensure=present) {
+
+       $package_ensure = $ensure ? {
+               present => installed,
+               absent  => $ensure
+       }
 
        package { 'schroot':
-               ensure => installed,
+               ensure => $package_ensure,
                tag    => extra_repo,
        }
        package { 'sbuild':
-               ensure => installed,
+               ensure => $package_ensure,
                tag    => extra_repo,
        }
        package { 'libsbuild-perl':
-               ensure => installed,
+               ensure => $package_ensure,
                tag    => extra_repo,
                before => Package['sbuild']
        }
 
        package { 'apt-transport-https':
-               ensure => installed,
+               ensure => $package_ensure,
        }
        package { [
                        'debootstrap',
@@ -24,8 +29,12 @@ class buildd {
                ensure => installed,
        }
 
-       site::linux_module { 'dm_snapshot': }
-       ferm::module { 'nf_conntrack_ftp': }
+       site::linux_module { 'dm_snapshot':
+               ensure => $ensure
+       }
+       ferm::module { 'nf_conntrack_ftp':
+               ensure => $ensure
+       }
 
        site::aptrepo { 'buildd':
                ensure => absent,
@@ -39,6 +48,7 @@ class buildd {
        }
 
        site::aptrepo { 'buildd.debian.org':
+               ensure     => $ensure,
                key        => 'puppet:///modules/buildd/buildd.debian.org.asc',
                url        => 'https://buildd.debian.org/apt/',
                suite      => $suite,
@@ -69,24 +79,28 @@ class buildd {
                ensure => absent,
        }
        file { '/etc/apt/preferences.d/buildd':
+               ensure  => $ensure,
                content => template('buildd/etc/apt/preferences.d/buildd'),
                before  => Site::Aptrepo['buildd.debian.org']
        }
        file { '/etc/schroot/mount-defaults':
+               ensure  => $ensure,
                content => template('buildd/etc/schroot/mount-defaults.erb'),
                require => Package['sbuild'],
        }
        file { '/etc/cron.d/dsa-buildd':
+               ensure  => $ensure,
                source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',
                require => Package['debian.org']
        }
        file { '/etc/dupload.conf':
+               ensure  => $ensure,
                source  => 'puppet:///modules/buildd/dupload.conf',
                require => Package['dupload'],
        }
        file { '/etc/default/schroot':
+               ensure  => $ensure,
                source  => 'puppet:///modules/buildd/default-schroot',
                require => Package['schroot']
        }
-
 }

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index aaeacee6ab26c052b76236a557dc0d7121cc591b..331aa118014b7f35b610adac3ac25c5882c3617e 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -14,6 +14,10 @@ class roles {
 
        if getfromhash($site::nodeinfo, 'buildd') {
                include buildd
+       } else {
+               class { 'buildd':
+                       ensure => absent
+               }
        }
 
        if getfromhash($site::nodeinfo, 'bugs_mirror') {