[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r221: Duplicate proper config in sysconfig (SLES does this for some reason).

[Jeff Licquia]

------------------------------------------------------------
revno: 221
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Mon 2012-03-05 16:58:33 -0500
message:
  Duplicate proper config in sysconfig (SLES does this for some reason).
added:
  modules/puppet/files/sysconfig/
  modules/puppet/files/sysconfig/default-sles11
modified:
  modules/puppet/manifests/init.pp
-------------- next part --------------
=== added directory 'modules/puppet/files/sysconfig'
=== added file 'modules/puppet/files/sysconfig/default-sles11'
--- a/modules/puppet/files/sysconfig/default-sles11	1970-01-01 00:00:00 +0000
+++ b/modules/puppet/files/sysconfig/default-sles11	2012-03-05 21:58:33 +0000
@@ -0,0 +1,55 @@
+## Path:        System/Management
+## Description: A network tool for managing many disparate systems
+## ServiceReload: puppet puppetmasterd
+
+## Type:        string
+## Default: "/var/log/puppet/puppetmaster.log"
+# 
+# Path to logfile
+#
+PUPPETMASTER_LOG="/var/log/puppet/puppetmaster.log"
+
+## Type:        string
+## Default: "/etc/puppet/manifests/site.pp"
+#
+# Path to manifest
+#
+PUPPETMASTER_MANIFEST="/etc/puppet/manifests/site.pp"
+
+## Type:        string
+## Default:
+#
+# Extra options for puppet
+#
+PUPPETMASTER_EXTRA_OPTS=""
+## Path:        System/Management
+## Description: A network tool for managing many disparate systems
+## ServiceReload: puppet
+
+## Type:        string
+## Default: puppet
+#
+# The puppetmaster server
+#
+PUPPET_SERVER=puppet.linuxbase.org
+
+## Type:        integer
+## Default: 8140
+#
+# If you wish to specify the port to connect to do so here
+#
+PUPPET_PORT=8140
+
+## Type:        string
+## Default: "/var/log/puppet/puppet.log"
+#
+# Where to log to. Specify syslog to send log messages to the system log.
+#
+PUPPET_LOG=/var/log/puppet/puppet.log
+
+## Type:        string
+## Default:
+#
+# You may specify other parameters to the puppet client here
+#
+PUPPET_EXTRA_OPTS=""

=== modified file 'modules/puppet/manifests/init.pp'
--- a/modules/puppet/manifests/init.pp	2012-02-12 18:31:49 +0000
+++ b/modules/puppet/manifests/init.pp	2012-03-05 21:58:33 +0000
@@ -1,5 +1,10 @@
 class puppet {
 
+    $osdefault = "$operatingsystem-$operatingsystem" ? {
+        /^SLES-11/ => 'default-sles11',
+        default    => 'default-sles11',
+    }
+
     $puppetversion = "$operatingsystem-$operatingsystemrelease" ? {
         /^SLES-11\.1$/  => '2.6.12-0.10.1',
         default         => present,
@@ -17,6 +22,13 @@
         mode  => 644,
     }
 
+    if $operatingsystem == "SLES" {
+        file { '/etc/sysconfig/puppet':
+            source => [ "puppet:///modules/puppet/sysconfig/$fqdn",
+                        "puppet:///modules/puppet/sysconfig/$osdefault" ],
+        }
+    }
+
     service { 'puppet':
         enable      => true,
         require     => Package['puppet'],