From 045ce0a3a531147e4d6ac19f2384ab13df17d9ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Fri, 18 Mar 2011 14:13:42 +0200
Subject: [PATCH] Added support for deploying RPM signing keys from puppet
 fileserver.

---
 yum/manifests/init.pp      | 14 ++++++++++++++
 yum/templates/yum.repo.erb |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/yum/manifests/init.pp b/yum/manifests/init.pp
index 1ad8334..31dc894 100644
--- a/yum/manifests/init.pp
+++ b/yum/manifests/init.pp
@@ -63,6 +63,20 @@ define yum::repo($baseurl="", $mirrorlist="", $descr="", $gpgkey="") {
         fail("Cannot set both \$baseurl and \$mirrorlist for yum::repo")
     }
 
+    if regsubst($gpgkey, "^(puppet://).*", '\1') == "puppet://" {
+        file { "/etc/pki/rpm-gpg/RPM-GPG-KEY-${name}":
+            ensure => present,
+            source => $gpgkey,
+            mode   => 0644,
+            owner  => "root",
+            group  => "root",
+            before => File["/etc/yum.repos.d/${name}.repo"],
+        }
+        $gpgkey_real = "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-${name}"
+    } else {
+        $gpgkey_real = $gpgkey
+    }
+
     if $descr {
         $descr_real = $descr
     } else {
diff --git a/yum/templates/yum.repo.erb b/yum/templates/yum.repo.erb
index 2f4b8ff..1d5424c 100644
--- a/yum/templates/yum.repo.erb
+++ b/yum/templates/yum.repo.erb
@@ -6,9 +6,9 @@ baseurl=<%= baseurl %>
 <% else -%>
 mirrorlist=<%= mirrorlist %>
 <% end -%>
-<% if gpgkey != '' -%>
+<% if gpgkey_real != '' -%>
 gpgcheck=1
-gpgkey=<%= gpgkey %>
+gpgkey=<%= gpgkey_real %>
 <% else -%>
 gpgcheck=0
 <% end -%>