From 16e295d6dcd715d959e2fad2cf0e25ba2938058e Mon Sep 17 00:00:00 2001
From: Stephen Gran <steve@lobefin.net>
Date: Sun, 3 Mar 2013 13:30:34 +0000
Subject: [PATCH] factor out schroot

Signed-off-by: Stephen Gran <steve@lobefin.net>
---
 modules/buildd/manifests/init.pp              | 42 ++++---------------
 .../{buildd => schroot}/files/default-schroot |  0
 modules/schroot/manifests/init.pp             | 18 ++++++++
 .../templates/etc/schroot/mount-defaults.erb  |  0
 4 files changed, 25 insertions(+), 35 deletions(-)
 rename modules/{buildd => schroot}/files/default-schroot (100%)
 create mode 100644 modules/schroot/manifests/init.pp
 rename modules/{buildd => schroot}/templates/etc/schroot/mount-defaults.erb (100%)

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 307419a7..dcf6fe74 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,45 +1,30 @@
 class buildd ($ensure=present) {
 
-	$package_ensure = $ensure ? {
-		present => installed,
-		absent  => $ensure
-	}
+	include schroot
 
-	package { 'schroot':
-		ensure => $package_ensure,
-		tag    => extra_repo,
-	}
 	package { 'sbuild':
-		ensure => $package_ensure,
+		ensure => installed,
 		tag    => extra_repo,
 	}
 	package { 'libsbuild-perl':
-		ensure => $package_ensure,
+		ensure => installed,
 		tag    => extra_repo,
 		before => Package['sbuild']
 	}
 
 	package { 'apt-transport-https':
-		ensure => $package_ensure,
+		ensure => installed,
 	}
 	if $ensure == present {
-		package { [
-				'debootstrap',
-				'dupload'
-			]:
+		package { 'dupload':
 			ensure => installed,
 		}
 		file { '/etc/dupload.conf':
-			ensure  => $ensure,
 			source  => 'puppet:///modules/buildd/dupload.conf',
 			require => Package['dupload'],
 		}
-		site::linux_module { 'dm_snapshot':
-			ensure => $ensure
-		}
-		ferm::module { 'nf_conntrack_ftp':
-			ensure => $ensure
-		}
+		site::linux_module { 'dm_snapshot': }
+		ferm::module { 'nf_conntrack_ftp': }
 	}
 
 	site::aptrepo { 'buildd':
@@ -54,7 +39,6 @@ class buildd ($ensure=present) {
 	}
 
 	site::aptrepo { 'buildd.debian.org':
-		ensure     => $ensure,
 		key        => 'puppet:///modules/buildd/buildd.debian.org.asc',
 		url        => 'https://buildd.debian.org/apt/',
 		suite      => $suite,
@@ -85,23 +69,11 @@ class buildd ($ensure=present) {
 		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/default/schroot':
-		ensure  => $ensure,
-		source  => 'puppet:///modules/buildd/default-schroot',
-		require => Package['schroot']
-	}
 }
diff --git a/modules/buildd/files/default-schroot b/modules/schroot/files/default-schroot
similarity index 100%
rename from modules/buildd/files/default-schroot
rename to modules/schroot/files/default-schroot
diff --git a/modules/schroot/manifests/init.pp b/modules/schroot/manifests/init.pp
new file mode 100644
index 00000000..d31f2329
--- /dev/null
+++ b/modules/schroot/manifests/init.pp
@@ -0,0 +1,18 @@
+class schroot {
+	package { 'schroot':
+		ensure => installed,
+		tag    => extra_repo,
+	}
+	package { 'debootstrap':
+		ensure => installed,
+	}
+
+	file { '/etc/schroot/mount-defaults':
+		content => template('schroot/etc/schroot/mount-defaults.erb'),
+		require => Package['sbuild'],
+	}
+	file { '/etc/default/schroot':
+		source  => 'puppet:///modules/schroot/default-schroot',
+		require => Package['schroot']
+	}
+}
diff --git a/modules/buildd/templates/etc/schroot/mount-defaults.erb b/modules/schroot/templates/etc/schroot/mount-defaults.erb
similarity index 100%
rename from modules/buildd/templates/etc/schroot/mount-defaults.erb
rename to modules/schroot/templates/etc/schroot/mount-defaults.erb
-- 
2.39.2