[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r29: Add module for managing Puppet itself.

Jeff Licquia licquia at linuxfoundation.org
Sun Jan 22 19:07:47 UTC 2012


------------------------------------------------------------
revno: 29
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Sun 2012-01-22 14:07:47 -0500
message:
  Add module for managing Puppet itself.
added:
  modules/puppet/
  modules/puppet/files/
  modules/puppet/files/puppet.conf
  modules/puppet/manifests/
  modules/puppet/manifests/init.pp
  modules/puppet/manifests/server.pp
modified:
  manifests/nodes/lsb1.pp
  manifests/nodes/pmman-test.pp
-------------- next part --------------
=== modified file 'manifests/nodes/lsb1.pp'
--- a/manifests/nodes/lsb1.pp	2012-01-22 04:13:51 +0000
+++ b/manifests/nodes/lsb1.pp	2012-01-22 19:07:47 +0000
@@ -1,5 +1,7 @@
 node 'lsb1.linux-foundation.org' {
 
+    include puppet::server
+
     include apachehttpd, apachehttpd::vhosts, apachehttpd::betaspecs
 
     include ftp

=== modified file 'manifests/nodes/pmman-test.pp'
--- a/manifests/nodes/pmman-test.pp	2012-01-18 22:20:55 +0000
+++ b/manifests/nodes/pmman-test.pp	2012-01-22 19:07:47 +0000
@@ -1,3 +1,6 @@
 # Test VM on Russ Herrold's network.
 node 'vm178231179.pmman.net' {
+
+    include puppet
+
 }

=== added directory 'modules/puppet'
=== added directory 'modules/puppet/files'
=== added file 'modules/puppet/files/puppet.conf'
--- a/modules/puppet/files/puppet.conf	1970-01-01 00:00:00 +0000
+++ b/modules/puppet/files/puppet.conf	2012-01-22 19:07:47 +0000
@@ -0,0 +1,29 @@
+[main]
+    # The Puppet log directory.
+    # The default value is '$vardir/log'.
+    logdir = /var/log/puppet
+
+    # Where Puppet PID files are kept.
+    # The default value is '$vardir/run'.
+    rundir = /var/run/puppet
+
+    # Where SSL certificates are kept.
+    # The default value is '$confdir/ssl'.
+    ssldir = $vardir/ssl
+
+    # Server.
+    server = puppet.linuxbase.org
+
+[agent]
+    # The file in which puppetd stores a list of the classes
+    # associated with the retrieved configuratiion.  Can be loaded in
+    # the separate ``puppet`` executable using the ``--loadclasses``
+    # option.
+    # The default value is '$confdir/classes.txt'.
+    classfile = $vardir/classes.txt
+
+    # Where puppetd caches the local configuration.  An
+    # extension indicating the cache format is added automatically.
+    # The default value is '$confdir/localconfig'.
+    localconfig = $vardir/localconfig
+

=== added directory 'modules/puppet/manifests'
=== added file 'modules/puppet/manifests/init.pp'
--- a/modules/puppet/manifests/init.pp	1970-01-01 00:00:00 +0000
+++ b/modules/puppet/manifests/init.pp	2012-01-22 19:07:47 +0000
@@ -0,0 +1,28 @@
+class puppet {
+
+    $puppetversion = "$operatingsystem-$operatingsystemrelease" ? {
+        /^SLES-11\.1$/  => '2.6.12-0.6.1',
+        default         => present,
+    }
+    $facterversion = "$operatingsystem-$operatingsystemrelease" ? {
+        /^SLES-11\.1$/  => '1.5.2-1.20',
+        default         => present,
+    }
+
+    file { 'puppet.conf':
+        name => '/etc/puppet/puppet.conf',
+        source => 'puppet:///modules/puppet/puppet.conf',
+        owner => 'root',
+        group => 'root',
+        mode  => 644,
+    }
+
+    service { 'puppet':
+        enable      => true,
+        require     => Package['puppet'],
+    }
+
+    package { 'facter': ensure => $facterversion; }
+    package { 'puppet': ensure => $puppetversion; }
+
+}

=== added file 'modules/puppet/manifests/server.pp'
--- a/modules/puppet/manifests/server.pp	1970-01-01 00:00:00 +0000
+++ b/modules/puppet/manifests/server.pp	2012-01-22 19:07:47 +0000
@@ -0,0 +1,10 @@
+class puppet::server inherits puppet {
+
+    package { 'puppet-server': ensure => $puppetversion; }
+
+    # For the Puppet server, puppet.conf is in the root of
+    # this repository, and we don't want to override it
+    # with the default client file.
+    File['puppet.conf'] { source => undef }
+
+}



More information about the lsb-messages mailing list