From 177ca132e3983db0c97bf14b9c02628bea801995 Mon Sep 17 00:00:00 2001
From: juniorsysadmin <juniorsysadmin@users.noreply.github.com>
Date: Sat, 18 Jul 2015 20:43:22 +1000
Subject: [PATCH] Remove soft dependency on treydock/gpg_key

---
 .fixtures.yml                    | 1 -
 README.md                        | 4 ----
 manifests/repo/nodesource/yum.pp | 7 ++-----
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index 80aaea31..fc6726d3 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -5,6 +5,5 @@ fixtures:
     "portage": "git://github.com/gentoo/puppet-portage.git"
     "chocolatey": "git://github.com/chocolatey/puppet-chocolatey.git"
     "epel": "git://github.com/stahnma/puppet-module-epel.git"
-    "gpg_key": "git://github.com/treydock/puppet-gpg_key.git"
   symlinks:
     "nodejs": "#{source_dir}"
diff --git a/README.md b/README.md
index fb27a855..5a35ed06 100644
--- a/README.md
+++ b/README.md
@@ -441,10 +441,6 @@ This module is not supported on Debian Squeeze.
 
 ### Module dependencies
 
-This module uses `treydock-gpg_key` for the import of RPM GPG keys. If using
-an operating system of the RedHat-based family, you will need to ensure that
-it is installed.
-
 This modules uses `puppetlabs-apt` for the management of the NodeSource
 repository. If using an operating system of the Debian-based family, you will
 need to ensure that `puppetlabs-apt` version 2.x is installed.
diff --git a/manifests/repo/nodesource/yum.pp b/manifests/repo/nodesource/yum.pp
index 2648cf34..e3825374 100644
--- a/manifests/repo/nodesource/yum.pp
+++ b/manifests/repo/nodesource/yum.pp
@@ -29,6 +29,7 @@
       proxy          => $proxy,
       proxy_password => $proxy_password,
       proxy_username => $proxy_username,
+      require        => File['/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL'],
     }
 
     yumrepo { 'nodesource-source':
@@ -42,6 +43,7 @@
       proxy          => $proxy,
       proxy_password => $proxy_password,
       proxy_username => $proxy_username,
+      require        => File['/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL'],
     }
 
     file { '/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL':
@@ -51,11 +53,6 @@
       owner  => 'root',
       source => "puppet:///modules/${module_name}/repo/nodesource/NODESOURCE-GPG-SIGNING-KEY-EL",
     }
-
-    gpg_key{ 'nodesource':
-      path   => '/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL',
-      before => [ Yumrepo['nodesource'], Yumrepo['nodesource-source'], ],
-    }
   }
 
   else {