[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r370: Upgrade Puppet server (and SLES agents) to 2.7.

[Jeff Licquia]

------------------------------------------------------------
revno: 370
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Sun 2012-12-30 18:02:09 -0500
message:
  Upgrade Puppet server (and SLES agents) to 2.7.
added:
  modules/puppet/files/home_lserepo.repo
modified:
  modules/puppet/manifests/init.pp
  modules/puppet/manifests/server.pp
-------------- next part --------------
=== added file 'modules/puppet/files/home_lserepo.repo'
--- a/modules/puppet/files/home_lserepo.repo	1970-01-01 00:00:00 +0000
+++ b/modules/puppet/files/home_lserepo.repo	2012-12-30 23:02:09 +0000
@@ -0,0 +1,7 @@
+[home_lserepo]
+name=LSE Repository (SLE_11_SP1)
+type=rpm-md
+baseurl=http://download.opensuse.org/repositories/home:/lserepo/SLE_11_SP1/
+gpgcheck=1
+gpgkey=http://download.opensuse.org/repositories/home:/lserepo/SLE_11_SP1/repodata/repomd.xml.key
+enabled=1

=== modified file 'modules/puppet/manifests/init.pp'
--- a/modules/puppet/manifests/init.pp	2012-10-28 20:52:44 +0000
+++ b/modules/puppet/manifests/init.pp	2012-12-30 23:02:09 +0000
@@ -7,7 +7,7 @@
     }
 
     $puppetversion = "$operatingsystem-$operatingsystemrelease" ? {
-        /^SLES-11\.1$/  => '2.6.17-0.3.1',
+        /^SLES-11\.1$/  => '2.7.6-9.1',
         default         => present,
     }
     $facterversion = "$operatingsystem-$operatingsystemrelease" ? {
@@ -24,6 +24,19 @@
     }
 
     if $operatingsystem == "SLES" {
+        file { 'etc/zypp/repos.d/home_lserepo.repo':
+            source => 'puppet:///modules/puppet/home_lserepo.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' ],
+            refreshonly => true,
+            logoutput   => true,
+        }
+
         file { '/etc/sysconfig/puppet':
             source => [ "puppet:///modules/puppet/sysconfig/$fqdn",
                         "puppet:///modules/puppet/sysconfig/$osdefault" ],

=== modified file 'modules/puppet/manifests/server.pp'
--- a/modules/puppet/manifests/server.pp	2012-01-29 00:09:20 +0000
+++ b/modules/puppet/manifests/server.pp	2012-12-30 23:02:09 +0000
@@ -1,6 +1,9 @@
 class puppet::server inherits puppet {
 
-    package { 'puppet-server': ensure => $puppetversion; }
+    package { 'puppet-server':
+        ensure  => $puppetversion;
+        require => File['/etc/zypp/repos.d/home_lserepo.repo'],
+    }
 
     # For the Puppet server, puppet.conf is in the root of
     # this repository, and we don't want to override it