]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
add version control for puppetmaster
authorStephen Gran <steve@lobefin.net>
Sun, 24 Jun 2012 08:45:49 +0000 (09:45 +0100)
committerStephen Gran <steve@lobefin.net>
Sun, 24 Jun 2012 08:46:02 +0000 (09:46 +0100)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/puppetmaster/manifests/init.pp
modules/site/manifests/params.pp [new file with mode: 0644]

index 1aad49cb2f2fbdba0f1dfdf9700b11c60027f551..8533a680f6344d8d44bd704903b85440e32f78de 100644 (file)
@@ -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 (file)
index 0000000..a425a81
--- /dev/null
@@ -0,0 +1,6 @@
+class site::params {
+       $puppetversion = $::hostname ? {
+               handel  => '2.7.14-1~bpo60+1',
+               default => '2.6.2-5+squeeze5',
+       }
+}