From: Stephen Gran <steve@lobefin.net>
Date: Sun, 24 Jun 2012 08:45:49 +0000 (+0100)
Subject: add version control for puppetmaster
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=83df2a0b3fd2d493c04fb117f5c7aa86e04582c4;p=dsa-puppet.git

add version control for puppetmaster

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

diff --git a/modules/puppetmaster/manifests/init.pp b/modules/puppetmaster/manifests/init.pp
index 1aad49cb..8533a680 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -1,5 +1,15 @@
 class puppetmaster {
 
+	include site::params
+
+	package { 'puppetmaster':
+		ensure => $site::params::puppetversion,
+		notify => Service['puppetmaster']
+	}
+	service { 'puppetmaster':
+		ensure => running,
+	}
+
 	file { '/etc/puppet/hiera.yaml':
 		source => 'puppet:///modules/puppetmaster/hiera.yaml'
 	}
diff --git a/modules/site/manifests/params.pp b/modules/site/manifests/params.pp
new file mode 100644
index 00000000..a425a818
--- /dev/null
+++ b/modules/site/manifests/params.pp
@@ -0,0 +1,6 @@
+class site::params {
+	$puppetversion = $::hostname ? {
+		handel  => '2.7.14-1~bpo60+1',
+		default => '2.6.2-5+squeeze5',
+	}
+}