Single-quote attributes, rather than double-quote

Fix EPEL URLs for key and mirrorlist

CHANGELOG.md

@@ -0,0 +1,5 @@
+Version 0.15.4
+--------------
+
+* Fix EPEL URLs for key and mirrorlist
+* Change double quote to single quote attributes

README.md

@@ -48,11 +48,6 @@ yumrepo::epel
    Fedora EPEL (Extra Packages for Enterprise Linux)
   * See http://fedoraproject.org/wiki/EPEL for more info
 
-yumrepo::elff
--------------
-
-- ELFF repo is deprecated, this is left in to clean up leftover repo files.
-
 yumrepo::dell
 -------------
 
@@ -62,8 +57,6 @@ yumrepo::dell
   - firmware / Convenient but unsupported by Dell
   * See http://linux.dell.com for more info
 
-# Attributes
-
 - repo[:dell][:download_firmware] = true||false
   * disables/enables community/firmware repositories in dell recipe
   * OMSA (hardware) repository will detect Dell hardware platform and
@@ -118,9 +111,13 @@ yumrepo::zenoss
   * See http://zenoss.org for more information
 
 yumrepo::corporate
+------------------
+
 - Generic example recipe to be used with an internal Yum mirror, or repository.
 
 yumrepo::jenkins
+----------------
+
 - Jenkins CI yum repository
 
 License and Author

attributes/annvix.rb

@@ -18,5 +18,5 @@
 # limitations under the License.
 #
 
-default["repo"]["annvix"]["key"] = "RPM-GPG-KEY-annvix"
-default["repo"]["annvix"]["url"] = "http://repo.annvix.org/media/EL#{node[:platform_version].split('.')[0]}/$basearch" 
+default['repo']['annvix']['key'] = "RPM-GPG-KEY-annvix"
+default['repo']['annvix']['url'] = "http://repo.annvix.org/media/EL#{node['platform_version'].split('.')[0]}/$basearch" 

attributes/corporate.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-default["repo"]["corp"]["name"] = "example"
-default["repo"]["corp"]["url"] = "http://yum.#{node["repo"]["corp"]["name"]}.com/yum"
-default["repo"]["corp"]["key"] = nil
-default["repo"]["corp"]["key_url"] = "#{node["repo"]["corp"]["url"]}/#{node["repo"]["corp"]["key"]}"
+default['repo']['corp']['name'] = "example"
+default['repo']['corp']['url'] = "http://yum.#{node['repo']['corp']['name']}.com/yum"
+default['repo']['corp']['key'] = nil
+default['repo']['corp']['key_url'] = "#{node['repo']['corp']['url']}/#{node['repo']['corp']['key']}"

attributes/default.rb

@@ -17,4 +17,4 @@
 # limitations under the License.
 #
 
-default["repo"]["key_path"] = "/etc/pki/rpm-gpg"
+default['repo']['key_path'] = "/etc/pki/rpm-gpg"

attributes/dell.rb

@@ -19,14 +19,14 @@
 #
 
 # Dell
-default["repo"]["dell"]["key"] = "RPM-GPG-KEY-dell"
-default["repo"]["dell"]["community_url"] = "http://linux.dell.com/repo/community/mirrors.cgi?osname=el#{node["platform_version"].to_i}\&basearch=$basearch"
-default["repo"]["dell"]["firmware_url"] = "http://linux.dell.com/repo/firmware/mirrors.pl?dellsysidpluginver=$dellsysidpluginver"
-default["repo"]["dell"]["omsa_independent_url"] = "http://linux.dell.com/repo/hardware/latest/mirrors.cgi?osname=el$releasever&basearch=$basearch&native=1&dellsysidpluginver=$dellsysidpluginver"
-default["repo"]["dell"]["omsa_specific_url"] = "http://linux.dell.com/repo/hardware/latest/mirrors.cgi?osname=el$releasever&basearch=$basearch&native=1&sys_ven_id=$sys_ven_id&sys_dev_id=$sys_dev_id&dellsysidpluginver=$dellsysidpluginver"
-default["repo"]["dell"]["download_firmware"] = false
-if node["dmi"] and node["dmi"]["system"] and node["dmi"]["system"]["manufacturer"] and node["dmi"]["system"]["manufacturer"] =~ /dell/i and node["platform_version"].to_f >= 5
-  set["repo"]["dell"]["enabled"] = true
+default['repo']['dell']['key'] = "RPM-GPG-KEY-dell"
+default['repo']['dell']['community_url'] = "http://linux.dell.com/repo/community/mirrors.cgi?osname=el#{node['platform_version'].to_i}\&basearch=$basearch"
+default['repo']['dell']['firmware_url'] = "http://linux.dell.com/repo/firmware/mirrors.pl?dellsysidpluginver=$dellsysidpluginver"
+default['repo']['dell']['omsa_independent_url'] = "http://linux.dell.com/repo/hardware/latest/mirrors.cgi?osname=el$releasever&basearch=$basearch&native=1&dellsysidpluginver=$dellsysidpluginver"
+default['repo']['dell']['omsa_specific_url'] = "http://linux.dell.com/repo/hardware/latest/mirrors.cgi?osname=el$releasever&basearch=$basearch&native=1&sys_ven_id=$sys_ven_id&sys_dev_id=$sys_dev_id&dellsysidpluginver=$dellsysidpluginver"
+default['repo']['dell']['download_firmware'] = false
+if node['dmi'] and node['dmi']['system'] and node['dmi']['system']['manufacturer'] and node['dmi']['system']['manufacturer'] =~ /dell/i and node['platform_version'].to_f >= 5
+  set['repo']['dell']['enabled'] = true
 else 
-  set["repo"]["dell"]["enabled"] = false
+  set['repo']['dell']['enabled'] = false
 end

attributes/epel.rb

@@ -17,11 +17,11 @@
 # limitations under the License.
 #
 
-default["repo"]["epel"]["url"] = "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-#{node[:platform_version].split('.')[0]}&arch=$basearch"
+default['repo']['epel']['url'] = "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-#{node['platform_version'].split('.')[0]}&arch=$basearch"
 
-if node["platform_version"].to_i >= 6
-  set["repo"]["epel"]["key"] = "RPM-GPG-KEY-EPEL-6"
+if node['platform_version'].to_i >= 6
+  set['repo']['epel']['key'] = "RPM-GPG-KEY-EPEL-6"
 else
-  set["repo"]["epel"]["key"] = "RPM-GPG-KEY-EPEL"
+  set['repo']['epel']['key'] = "RPM-GPG-KEY-EPEL"
 end
-default["repo"]["epel"]["key_url"] = "http://download.fedora.redhat.com/pub/epel/#{node["repo"]["epel"]["key"]}"
+default['repo']['epel']['key_url'] = "http://download.fedoraproject.org/pub/epel/#{node['repo']['epel']['key']}"

attributes/jenkins.rb

@@ -17,6 +17,6 @@
 # limitations under the License.
 #
 
-default["repo"]["jenkins"]["url"] = "http://pkg.jenkins-ci.org/redhat"
-default["repo"]["jenkins"]["key"] = "jenkins-ci.org.key"
-default["repo"]["jenkins"]["key_url"] = "http://pkg.jenkins-ci.org/redhat/#{node["repo"]["jenkins"]["key"]}"
+default['repo']['jenkins']['url'] = "http://pkg.jenkins-ci.org/redhat"
+default['repo']['jenkins']['key'] = "jenkins-ci.org.key"
+default['repo']['jenkins']['key_url'] = "http://pkg.jenkins-ci.org/redhat/#{node['repo']['jenkins']['key']}"

attributes/postgresql9.rb

@@ -18,5 +18,5 @@
 # limitations under the License.
 #
 
-default["repo"]["postgresql"]["url"] = "http://yum.pgrpms.org/9.0/redhat/rhel-$releasever-$basearch"
-default["repo"]["postgresql"]["key"] = "RPM-GPG-KEY-PGDG"
+default['repo']['postgresql']['url'] = "http://yum.pgrpms.org/9.0/redhat/rhel-$releasever-$basearch"
+default['repo']['postgresql']['key'] = "RPM-GPG-KEY-PGDG"

attributes/rbel.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 #
 
-default["repo"]["rbel"]["url"] = "http://rbel.frameos.org/stable/el#{node["platform_version"].to_i}/$basearch"
-default["repo"]["rbel"]["key"] = "RPM-GPG-KEY-RBEL"
+default['repo']['rbel']['url'] = "http://rbel.frameos.org/stable/el#{node['platform_version'].to_i}/$basearch"
+default['repo']['rbel']['key'] = "RPM-GPG-KEY-RBEL"

attributes/vmware-tools.rb

@@ -19,27 +19,27 @@
 #
 
 # VMware
-default["repo"]["vmware"]["key"] = "VMWARE-PACKAGING-GPG-KEY"
-default["repo"]["vmware"]["release"] = "4.1"
-default["repo"]["vmware"]["install_optional"] = false
-if node["dmi"] and node["dmi"]["system"] and node["dmi"]["system"]["manufacturer"] and node["dmi"]["system"]["manufacturer"] =~ /vmware/i and node["platform_version"].to_f >= 5
-  set["repo"]["vmware"]["enabled"] = true
+default['repo']['vmware']['key'] = "VMWARE-PACKAGING-GPG-KEY"
+default['repo']['vmware']['release'] = "4.1"
+default['repo']['vmware']['install_optional'] = false
+if node['dmi'] and node['dmi']['system'] and node['dmi']['system']['manufacturer'] and node['dmi']['system']['manufacturer'] =~ /vmware/i and node['platform_version'].to_f >= 5
+  set['repo']['vmware']['enabled'] = true
 else
-  set["repo"]["vmware"]["enabled"] = false
+  set['repo']['vmware']['enabled'] = false
 end
 
-default["repo"]["vmware"]["url"] = "http://packages.vmware.com/tools/esx/#{node["repo"]["vmware"]["release"]}/rhel#{node["platform_version"].to_i}/$basearch"
-default["repo"]["vmware"]["key_url"] = "http://packages.vmware.com/tools/#{node["repo"]["vmware"]["key"]}.pub"
+default['repo']['vmware']['url'] = "http://packages.vmware.com/tools/esx/#{node['repo']['vmware']['release']}/rhel#{node['platform_version'].to_i}/$basearch"
+default['repo']['vmware']['key_url'] = "http://packages.vmware.com/tools/#{node['repo']['vmware']['key']}.pub"
 
-default["repo"]["vmware"]["required_packages"] = [
+default['repo']['vmware']['required_packages'] = [
   "vmware-tools-nox",
   "vmware-tools-common",
   "vmware-open-vm-tools-common",
   "vmware-open-vm-tools-nox",
   "vmware-open-vm-tools-kmod"
 ]
 
-default["repo"]["vmware"]["optional_packages"] = [
+default['repo']['vmware']['optional_packages'] = [
   "vmware-open-vm-tools-xorg-drv-display",
   "vmware-open-vm-tools-xorg-drv-mouse"
 ]

attributes/zenoss.rb

@@ -17,6 +17,6 @@
 # limitations under the License.
 #
 
-default["repo"]["zenoss"]["url"] = "http://dev.zenoss.com/yum/stable/"
-default["repo"]["zenoss"]["key"] = "RPM-GPG-KEY-zenoss"
-default["repo"]["zenoss"]["key_url"] = "http://dev.zenoss.com/yum/#{node["repo"]["zenoss"]["key"]}"
+default['repo']['zenoss']['url'] = "http://dev.zenoss.com/yum/stable/"
+default['repo']['zenoss']['key'] = "RPM-GPG-KEY-zenoss"
+default['repo']['zenoss']['key_url'] = "http://dev.zenoss.com/yum/#{node['repo']['zenoss']['key']}"

metadata.rb

@@ -3,7 +3,7 @@
 license          "Apache 2.0"
 description      "Installs and configures EPEL, ELFF, Dell, and VMware yum repositories."
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "0.15.2"
+version          "0.15.4"
 depends          "yum"
 recipe "yumrepo::default", "Installs EPEL, ELFF, Dell, and VMware Tools repositories."
 recipe "yumrepo::epel", "Installs Fedora Extra Packages for Enterprise Linux (EPEL) repository"
@@ -15,7 +15,7 @@
 recipe "yumrepo::zenoss", "YUM repo for ZenOss stable"
 recipe "yumrepo::jenkins", "Jenkins CI"
 
-%w{ redhat centos scientific }.each do |os|
+%w{ redhat centos scientific amazon }.each do |os|
   supports os, ">= 5.0"
 end
 

recipes/annvix.rb

@@ -17,15 +17,15 @@
 # limitations under the License.
 #
 
-cookbook_file "#{node["repo"]["key_path"]}/#{node["repo"]["annvix"]["key"]}"
+cookbook_file "#{node['repo']['key_path']}/#{node['repo']['annvix']['key']}"
 
-yum_key node["repo"]["annvix"]["key"] do
+yum_key node['repo']['annvix']['key'] do
   action :add
 end
 
 yum_repository "annvix" do
-  description "CentOS/RHEL-EL#{node["platform_version"].split('.')[0]} - Annvix"
-  key node["repo"]["annvix"]["key"]
-  url node["repo"]["annvix"]["url"] 
+  description "CentOS/RHEL-EL#{node['platform_version'].split('.')[0]} - Annvix"
+  key node['repo']['annvix']['key']
+  url node['repo']['annvix']['url'] 
   action :add
 end

recipes/corporate.rb

@@ -17,22 +17,22 @@
 # limitations under the License.
 #
 
-if ! node["repo"]["corp"]["key"].nil?
-  yum_key node["repo"]["corp"]["key"] do
-    url node["repo"]["corp"]["key_url"] 
+if ! node['repo']['corp']['key'].nil?
+  yum_key node['repo']['corp']['key'] do
+    url node['repo']['corp']['key_url'] 
     action :add
   end
 
-  yum_repository node["repo"]["corp"]["name"] do
-    description "#{node["repo"]["corp"]["name"]} Yum Repo"
-    key node["repo"]["corp"]["key"]
-    url node["repo"]["corp"]["url"]
+  yum_repository node['repo']['corp']['name'] do
+    description "#{node['repo']['corp']['name']} Yum Repo"
+    key node['repo']['corp']['key']
+    url node['repo']['corp']['url']
     action :add
   end
 else
-  yum_repository node["repo"]["corp"]["name"] do
-    description "#{node["repo"]["corp"]["name"]} Yum Repo"
-    url node["repo"]["corp"]["url"]
+  yum_repository node['repo']['corp']['name'] do
+    description "#{node['repo']['corp']['name']} Yum Repo"
+    url node['repo']['corp']['url']
     action :add
   end
 end

recipes/dell.rb

@@ -18,51 +18,51 @@
 # limitations under the License.
 #
 
-if not node["repo"]["dell"]["enabled"]
+if not node['repo']['dell']['enabled']
   return
 end
 
-cookbook_file "#{node["repo"]["key_path"]}/#{node["repo"]["dell"]["key"]}"
+cookbook_file "#{node['repo']['key_path']}/#{node["repo"]["dell"]["key"]}"
 
-yum_key node["repo"]["dell"]["key"] do
+yum_key node['repo']['dell']['key'] do
   action :add
 end
 
 yum_repository "dell-community-repository" do
   description "Dell Community Repository"
-  url node["repo"]["dell"]["community_url"]
+  url node['repo']['dell']['community_url']
   mirrorlist true
-  key node["repo"]["dell"]["key"]
+  key node['repo']['dell']['key']
   action :add
 end
 
 yum_repository "dell-omsa-indep" do
   description "Dell OMSA repository - Hardware independent"
-  url node["repo"]["dell"]["omsa_independent_url"]
+  url node['repo']['dell']['omsa_independent_url']
   mirrorlist true
-  key node["repo"]["dell"]["key"]
+  key node['repo']['dell']['key']
   action :add
 end
 
 yum_repository "dell-omsa-specific" do
   description "Dell OMSA repository - Hardware specific"
-  url node["repo"]["dell"]["omsa_specific_url"]
+  url node['repo']['dell']['omsa_specific_url']
   mirrorlist true
-  key node["repo"]["dell"]["key"]
+  key node['repo']['dell']['key']
   action :add
 end
 
 yum_repository "fwupdate" do
   description "Firmware updates"
-  url node["repo"]["dell"]["firmware_url"]
+  url node['repo']['dell']['firmware_url']
   mirrorlist true
-  key node["repo"]["dell"]["key"]
+  key node['repo']['dell']['key']
   action :add
 end
 
 package "srvadmin-all"
 
-if node["repo"]["dell"]["download_firmware"]
+if node['repo']['dell']['download_firmware']
   package "firmware-tools" do
     ignore_failure true
   end

recipes/epel.rb

@@ -18,15 +18,15 @@
 # limitations under the License.
 #
 
-yum_key node["repo"]["epel"]["key"] do
-  url  node["repo"]["epel"]["key_url"]
+yum_key node['repo']['epel']['key'] do
+  url  node['repo']['epel']['key_url']
   action :add
 end
 
 yum_repository "epel" do
   description "Extra Packages for Enterprise Linux"
-  key node["repo"]["epel"]["key"]
-  url node["repo"]["epel"]["url"]
+  key node['repo']['epel']['key']
+  url node['repo']['epel']['url']
   mirrorlist true
   action :add
 end

recipes/jenkins.rb

@@ -17,14 +17,14 @@
 # limitations under the License.
 #
 
-yum_key node["repo"]["jenkins"]["key"] do
-  url  node["repo"]["jenkins"]["key_url"]
+yum_key node['repo']['jenkins']['key'] do
+  url  node['repo']['jenkins']['key_url']
   action :add
 end
 
 yum_repository "jenkins" do
   description "Jenkins"
-  key node["repo"]["jenkins"]["key"]
-  url node["repo"]["jenkins"]["url"]
+  key node['repo']['jenkins']['key']
+  url node['repo']['jenkins']['url']
   action :add
 end

recipes/postgresql9.rb

@@ -17,15 +17,15 @@
 # limitations under the License.
 #
 
-cookbook_file "#{node["repo"]["key_path"]}/#{node["repo"]["postgresql"]["key"]}"
+cookbook_file "#{node['repo']['key_path']}/#{node['repo']['postgresql']['key']}"
 
-yum_key node["repo"]["postgresql"]["key"] do
+yum_key node['repo']['postgresql']['key'] do
   action :add
 end
 
 yum_repository "postgresql9" do
   description "PostgreSQL 9.0"
-  key node["repo"]["postgresql"]["key"] 
-  url node["repo"]["postgresql"]["url"] 
+  key node['repo']['postgresql']['key'] 
+  url node['repo']['postgresql']['url'] 
   action :add
 end

recipes/rbel.rb

@@ -17,15 +17,15 @@
 # limitations under the License.
 #
 
-cookbook_file "#{node["repo"]["key_path"]}/#{node["repo"]["rbel"]["key"]}"
+cookbook_file "#{node['repo']['key_path']}/#{node['repo']['rbel']['key']}"
 
-yum_key node["repo"]["rbel"]["key"] do
+yum_key node['repo']['rbel']['key'] do
   action :add
 end
 
-yum_repository "rbel#{node["platform_version"].to_i}" do
-  description "RBEL #{node["platform_version"].to_i} repo"
-  key node["repo"]["rbel"]["key"] 
-  url node["repo"]["rbel"]["url"] 
+yum_repository "rbel#{node['platform_version'].to_i}" do
+  description "RBEL #{node['platform_version'].to_i} repo"
+  key node['repo']['rbel']['key'] 
+  url node['repo']['rbel']['url'] 
   action :add
 end