From: Stephen Gran <steve@lobefin.net>
Date: Tue, 17 Apr 2012 19:29:54 +0000 (+0100)
Subject: simplify site::aptrepo
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=5f7e9b2a528a64883641f38558c028ae4b1967f0

simplify site::aptrepo

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 79065a17..ab6b05a2 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -23,8 +23,8 @@ class buildd {
 		ensure => absent,
 	}
 	site::aptrepo { 'buildd.debian.org':
-		template => 'buildd/etc/apt/sources.list.d/buildd.list.erb',
-		key      => 'puppet:///modules/buildd/buildd.debian.org.asc',
+		content => template('buildd/etc/apt/sources.list.d/buildd.list.erb'),
+		key     => 'puppet:///modules/buildd/buildd.debian.org.asc',
 	}
 
 	file { '/etc/apt/preferences.d/buildd':
diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index da54711e..9da7de53 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -62,13 +62,13 @@ class debian-org {
 
 	if $::debarchitecture != 'armhf' {
 		site::aptrepo { 'security':
-			template => 'debian-org/etc/apt/sources.list.d/security.list.erb',
+			content => template('debian-org/etc/apt/sources.list.d/security.list.erb'),
 		}
 		site::aptrepo { 'backports.debian.org':
-			template => 'debian-org/etc/apt/sources.list.d/backports.debian.org.list.erb',
+			content => template('debian-org/etc/apt/sources.list.d/backports.debian.org.list.erb'),
 		}
 		site::aptrepo { 'volatile':
-			template => 'debian-org/etc/apt/sources.list.d/volatile.list.erb',
+			content => template('debian-org/etc/apt/sources.list.d/volatile.list.erb'),
 		}
 	}
 	site::aptrepo { 'backports.org':
@@ -82,8 +82,8 @@ class debian-org {
 	}
 
 	site::aptrepo { 'db.debian.org':
-		template => 'debian-org/etc/apt/sources.list.d/debian.org.list.erb',
-		key      => 'puppet:///modules/debian-org/db.debian.org.asc',
+		content => template('debian-org/etc/apt/sources.list.d/debian.org.list.erb'),
+		key     => 'puppet:///modules/debian-org/db.debian.org.asc',
 	}
 
 	file { '/etc/facter':
diff --git a/modules/debian-org/manifests/proliant.pp b/modules/debian-org/manifests/proliant.pp
index 04b9cdd3..afb6bed5 100644
--- a/modules/debian-org/manifests/proliant.pp
+++ b/modules/debian-org/manifests/proliant.pp
@@ -1,7 +1,7 @@
 class debian-org::proliant {
 
 	site::aptrepo { 'debian.restricted':
-		template => 'debian-org/etc/apt/sources.list.d/debian.restricted.list.erb',
+		content => template('debian-org/etc/apt/sources.list.d/debian.restricted.list.erb'),
 	}
 
 	package { 'hpacucli':
@@ -26,5 +26,3 @@ class debian-org::proliant {
 		}
 	}
 }
-
-
diff --git a/modules/megactl/manifests/init.pp b/modules/megactl/manifests/init.pp
index 3c376639..7dd32afa 100644
--- a/modules/megactl/manifests/init.pp
+++ b/modules/megactl/manifests/init.pp
@@ -4,6 +4,6 @@ class megactl {
 	}
 
 	site::aptrepo { 'debian.restricted':
-		template => 'debian-org/etc/apt/sources.list.d/debian.restricted.list.erb',
+		content => template('debian-org/etc/apt/sources.list.d/debian.restricted.list.erb'),
 	}
 }
diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index b12593da..7e3ac019 100644
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -4,7 +4,7 @@ class named::geodns inherits named {
 	}
 
 	site::aptrepo { 'geoip':
-		template => 'debian-org/etc/apt/sources.list.d/geoip.list.erb',
+		content => template('debian-org/etc/apt/sources.list.d/geoip.list.erb'),
 	}
 
 	file { '/etc/bind/':
diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index ae66d6f2..ea1b9202 100644
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -1,5 +1,4 @@
-define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config = undef, $ensure = present) {
-
+define site::aptrepo ($key = undef, $keyid = undef, $content = '', $source = '', $ensure = present) {
 
 	case $ensure {
 		present: {
@@ -40,22 +39,15 @@ define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config =
 	}
 
 	if $ensure == present {
-		if ! ($config or $template) {
+		if ! ($source or $content) {
 			fail ( "No configuration found for ${name}" )
 		}
 	}
 
-	if $template {
-		file { "/etc/apt/sources.list.d/${name}.list":
-			ensure  => $ensure,
-			content => template($template),
-			notify => Exec['apt-get update'],
-		}
-	} else {
-		file { "/etc/apt/sources.list.d/${name}.list":
-			ensure => $ensure,
-			source => $config,
-			notify => Exec['apt-get update'],
-		}
+	file { "/etc/apt/sources.list.d/${name}.list":
+		ensure  => $ensure,
+		content => $content,
+		source  => $source,
+		notify  => Exec['apt-get update'],
 	}
 }