[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r464: Upgrade Puppet master and agent to 3.x.

[Jeff Licquia]

------------------------------------------------------------
revno: 464
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Tue 2013-05-14 18:42:55 -0400
message:
  Upgrade Puppet master and agent to 3.x.
added:
  modules/puppet/files/systemsmanagement_puppet.repo
modified:
  modules/puppet/manifests/init.pp
  modules/puppet/manifests/server.pp
-------------- next part --------------
=== added file 'modules/puppet/files/systemsmanagement_puppet.repo'
--- a/modules/puppet/files/systemsmanagement_puppet.repo	1970-01-01 00:00:00 +0000
+++ b/modules/puppet/files/systemsmanagement_puppet.repo	2013-05-14 22:42:55 +0000
@@ -0,0 +1,7 @@
+[systemsmanagement_puppet]
+name=A network tool for managing many disparate systems (SLE_11_SP2)
+type=rpm-md
+baseurl=http://download.opensuse.org/repositories/systemsmanagement:/puppet/SLE_11_SP2/
+gpgcheck=1
+gpgkey=http://download.opensuse.org/repositories/systemsmanagement:/puppet/SLE_11_SP2/repodata/repomd.xml.key
+enabled=1

=== modified file 'modules/puppet/manifests/init.pp'
--- a/modules/puppet/manifests/init.pp	2013-05-14 21:33:59 +0000
+++ b/modules/puppet/manifests/init.pp	2013-05-14 22:42:55 +0000
@@ -8,14 +8,16 @@
 
     $puppetversion = "${operatingsystem}-${operatingsystemrelease}-${architecture}" ? {
         /^SLES-11\..-s390x$/ => '2.6.17-0.3.1',
-        /^SLES-11\..-.*$/    => '2.7.6-9.1',
+        /^SLES-11\.1-.*$/    => '2.7.6-9.1',
+        /^SLES-11\.2-.*$/    => '3.1.1-1.7',
         default              => present,
     }
 
-    $puppetmasterversion = '2.7.6-9.1'
+    $puppetmasterversion = '3.1.1-1.7'
 
     $facterversion = "${operatingsystem}-${operatingsystemrelease}" ? {
         /^SLES-11\.1$/  => '1.5.2-1.20',
+        /^SLES-11\.2$/  => '1.6.18-1.1',
         default         => present,
     }
 
@@ -34,6 +36,12 @@
             before => Package['puppet'],
         }
 
+        file { '/etc/zypp/repos.d/systemsmanagement_puppet.repo':
+            source => 'puppet:///modules/puppet/systemsmanagement_puppet.repo',
+            notify => Exec['refresh-zypper-keys-for-puppet'],
+            before => Package['puppet'],
+        }
+
         exec { 'refresh-zypper-keys-for-puppet':
             command     => 'zypper --gpg-auto-import-keys refresh',
             path        => [ '/usr/sbin', '/usr/bin', '/bin', '/sbin' ],
@@ -48,7 +56,7 @@
         }
 
         # For SLES 11 systems that have the vendor puppet package,
-        # zypper will prevent upgrading to the 2.7 package due to
+        # zypper will prevent upgrading to a newer package due to
         # the vendor change.  So, in order to make that happen, we
         # temporarily ignore vendor changes.
 

=== modified file 'modules/puppet/manifests/server.pp'
--- a/modules/puppet/manifests/server.pp	2013-05-14 21:33:59 +0000
+++ b/modules/puppet/manifests/server.pp	2013-05-14 22:42:55 +0000
@@ -2,7 +2,7 @@
 
     package { 'puppet-server':
         ensure  => $puppetmasterversion,
-        require => File['/etc/zypp/repos.d/home_lserepo.repo'],
+        require => File['/etc/zypp/repos.d/systemsmanagement_puppet.repo'],
     }
 
     # For the Puppet server, puppet.conf is in the root of