refactor yum_baseurl support

README.md

@@ -37,6 +37,7 @@ This cookbook installs the newrelic-sysmond components if not present, and pulls
 default["new_relic"]["apt_uri"]        = "http://apt.newrelic.com/debian/"
 default["new_relic"]["apt_key"]        = "548C16BF"
 default["new_relic"]["keyserver"]      = "keyserver.ubuntu.com"
+default["new_relic"]["yum_baseurl"]    = "https://yum.newrelic.com/pub/newrelic/el5/#{node["kernel"]["machine"]}"
 default["new_relic"]["license_key"]    = ""
 default["new_relic"]["loglevel"]       = "info"
 default["new_relic"]["logfile"]        = "/var/log/newrelic/nrsysmond.log"
@@ -48,12 +49,6 @@ default["new_relic"]["pidfile"]        = ""
 default["new_relic"]["collector_host"] = "collector.newrelic.com"
 default["new_relic"]["timeout"]        = 30
 default["new_relic"]["hostname"]       = ""
-
-# Repository
-default["yum"]["new_relic"]["name"] = "newrelic"
-default["yum"]["new_relic"]["description"] = "New Relic"
-default["yum"]["new_relic"]["baseurl"] = "https://yum.newrelic.com/pub/newrelic/el5/#{node["kernel"]["machine"]}"
-
 ```
 
 

attributes/default.rb

@@ -10,6 +10,7 @@
 default["new_relic"]["apt_uri"]        = "http://apt.newrelic.com/debian/"
 default["new_relic"]["apt_key"]        = "548C16BF"
 default["new_relic"]["keyserver"]      = "keyserver.ubuntu.com"
+default["new_relic"]["yum_baseurl"]    = "https://yum.newrelic.com/pub/newrelic/el5/#{node["kernel"]["machine"]}"
 default["new_relic"]["license_key"]    = ""
 default["new_relic"]["loglevel"]       = "info"
 default["new_relic"]["logfile"]        = "/var/log/newrelic/nrsysmond.log"
@@ -21,8 +22,3 @@
 default["new_relic"]["collector_host"] = "collector.newrelic.com"
 default["new_relic"]["timeout"]        = 30
 default["new_relic"]["hostname"]       = ""
-
-# Repository
-default["yum"]["new_relic"]["name"] = "newrelic"
-default["yum"]["new_relic"]["description"] = "New Relic"
-default["yum"]["new_relic"]["baseurl"] = "https://yum.newrelic.com/pub/newrelic/el5/#{node["kernel"]["machine"]}"

recipes/default.rb

@@ -18,19 +18,21 @@
   return
 end
 
-if platform_family?("debian")
-  apt_repository "newrelic" do
-    uri node["new_relic"]["apt_uri"]
-    components %w[newrelic non-free]
-    key node["new_relic"]["apt_key"]
-    keyserver node["new_relic"]["keyserver"]
-  end
-elsif platform_family?("rhel")
-  yum_repository node["yum"]["new_relic"]["name"] do
-    description node["yum"]["new_relic"]["description"]
-    baseurl node["yum"]["new_relic"]["baseurl"]
-    gpgcheck false
-  end
+# apt repository
+apt_repository "newrelic" do
+  uri node["new_relic"]["apt_uri"]
+  components %w[newrelic non-free]
+  key node["new_relic"]["apt_key"]
+  keyserver node["new_relic"]["keyserver"]
+  only_if { platform_family?("debian") }
+end
+
+# yum repository
+yum_repository "newrelic" do
+  description "New Relic"
+  baseurl node["new_relic"]["yum_baseurl"]
+  gpgcheck false
+  only_if { platform_family?("rhel") }
 end
 
 package "newrelic-sysmond"