[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r536: Port puppet master config to work on lsb2.

Jeff Licquia licquia at linuxfoundation.org
Fri Feb 21 01:43:00 UTC 2014


------------------------------------------------------------
revno: 536
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Thu 2014-02-20 20:43:00 -0500
message:
  Port puppet master config to work on lsb2.
modified:
  manifests/nodes/lsb2.pp
  modules/puppet/manifests/init.pp
  modules/puppet/manifests/server.pp
-------------- next part --------------
=== modified file 'manifests/nodes/lsb2.pp'
--- a/manifests/nodes/lsb2.pp	2014-02-21 00:33:04 +0000
+++ b/manifests/nodes/lsb2.pp	2014-02-21 01:43:00 +0000
@@ -6,4 +6,6 @@
 
     include sudo
 
+    include puppet::server
+
 }

=== modified file 'modules/puppet/manifests/init.pp'
--- a/modules/puppet/manifests/init.pp	2014-01-02 04:56:01 +0000
+++ b/modules/puppet/manifests/init.pp	2014-02-21 01:43:00 +0000
@@ -13,7 +13,10 @@
         default              => present,
     }
 
-    $puppetmasterversion = '3.1.1-1.7'
+    $puppetmasterversion = "${operatingsystem}-${operatingsystemrelease}-${architecture}" ? {
+        /^SLES-11\.2-.*$/ => '3.1.1-1.7',
+        default           => present,
+    }
 
     $facterversion = "${operatingsystem}-${operatingsystemrelease}" ? {
         /^SLES-11\.1$/  => '1.5.2-1.20',
@@ -24,6 +27,7 @@
     $puppetservice = "${operatingsystem}-${operatingsystemrelease}" ? {
         /^Fedora-16/ => 'puppet',
         /^Fedora-/   => 'puppetagent',
+        /^OpenSuSE-/ => 'puppetagent',
         default      => 'puppet',
     }
 

=== modified file 'modules/puppet/manifests/server.pp'
--- a/modules/puppet/manifests/server.pp	2013-05-14 22:42:55 +0000
+++ b/modules/puppet/manifests/server.pp	2014-02-21 01:43:00 +0000
@@ -14,13 +14,23 @@
     # Requires that sudo be configured to allow the MTA user
     # to run "/usr/bin/bzr update -q" as root.
 
-    file { '/usr/local/bin/puppet-email-notify':
-        source => [ "puppet:///modules/puppet/puppet-email-notify" ],
-        mode => 0755,
-    }
-
-    mailalias { 'puppet-notify':
-        recipient => '|/usr/local/bin/puppet-email-notify',
+    #file { '/usr/local/bin/puppet-email-notify':
+    #    source => [ "puppet:///modules/puppet/puppet-email-notify" ],
+    #    mode => 0755,
+    #}
+
+    #mailalias { 'puppet-notify':
+    #    recipient => '|/usr/local/bin/puppet-email-notify',
+    #}
+
+    # Disabled the email auto-update feature; instead, while we
+    # migrate from lsb1 to lsb2, just do an update via cron
+    # every few minutes, like with puppet-secret.
+
+    cron { 'update-puppet':
+        command => 'cd /etc/puppet && bzr up -q',
+        user    => 'root',
+        minute  => '*/5',
     }
 
     # Update the secrets repository as well.  This is assumed to be



More information about the lsb-messages mailing list