Skip to content

Commit

Permalink
Merge pull request #2 from joshoohaah/master
Browse files Browse the repository at this point in the history
proposed fix to remove the warnings about upcoming chef 13.
  • Loading branch information
juliandunn committed Oct 31, 2015
2 parents 322aca7 + 1bfdbbf commit c9773ac
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 40 deletions.
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
*~
*#
.#*
\#*#
.*.sw[a-z]
*.un~
pkg/

# Berkshelf
.vagrant
/cookbooks
Berksfile.lock

# Bundler
Gemfile.lock
bin/*
.bundle/*

.kitchen/
.kitchen.local.yml
4 changes: 2 additions & 2 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ provisioner:
name: chef_zero

platforms:
- name: oracle-5.10
- name: oracle-6.5
- name: oracle-5.10
- name: oracle-6.5

suites:
- name: default
Expand Down
9 changes: 0 additions & 9 deletions Berksfile.lock

This file was deleted.

6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
yum-fedora Cookbook CHANGELOG
======================
This file is used to list changes made in each version of the yum-centos cookbook.
This file is used to list changes made in each version of the yum-oracle cookbook.

v1.0.1 (2015-10-30)
-------------------
- updated for errors to be compatible with Chef 13

v0.2.0 (2014-02-14)
-------------------
Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
license 'Apache 2.0'
description 'Configures yum repos on an Oracle Linux system'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '1.0.0'
version '1.0.1'

depends 'yum', '~> 3.0'
supports 'oracle'
54 changes: 27 additions & 27 deletions recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,33 +32,33 @@
repos.each do |repo|
if node['yum'][repo]['managed']
yum_repository repo do
description node['yum'][repo]['description']
baseurl node['yum'][repo]['baseurl']
mirrorlist node['yum'][repo]['mirrorlist']
gpgcheck node['yum'][repo]['gpgcheck']
gpgkey node['yum'][repo]['gpgkey']
enabled node['yum'][repo]['enabled']
cost node['yum'][repo]['cost']
exclude node['yum'][repo]['exclude']
enablegroups node['yum'][repo]['enablegroups']
failovermethod node['yum'][repo]['failovermethod']
http_caching node['yum'][repo]['http_caching']
include_config node['yum'][repo]['include_config']
includepkgs node['yum'][repo]['includepkgs']
keepalive node['yum'][repo]['keepalive']
max_retries node['yum'][repo]['max_retries']
metadata_expire node['yum'][repo]['metadata_expire']
mirror_expire node['yum'][repo]['mirror_expire']
priority node['yum'][repo]['priority']
proxy node['yum'][repo]['proxy']
proxy_username node['yum'][repo]['proxy_username']
proxy_password node['yum'][repo]['proxy_password']
repositoryid node['yum'][repo]['repositoryid']
sslcacert node['yum'][repo]['sslcacert']
sslclientcert node['yum'][repo]['sslclientcert']
sslclientkey node['yum'][repo]['sslclientkey']
sslverify node['yum'][repo]['sslverify']
timeout node['yum'][repo]['timeout']
description node['yum'][repo]['description'] if node['yum'][repo]['description']
baseurl node['yum'][repo]['baseurl'] if node['yum'][repo]['baseurl']
mirrorlist node['yum'][repo]['mirrorlist'] if node['yum'][repo]['mirrorlist']
gpgcheck node['yum'][repo]['gpgcheck'] if node['yum'][repo]['gpgcheck']
gpgkey node['yum'][repo]['gpgkey'] if node['yum'][repo]['gpgkey']
enabled node['yum'][repo]['enabled'] if node['yum'][repo]['enabled']
cost node['yum'][repo]['cost'] if node['yum'][repo]['cost']
exclude node['yum'][repo]['exclude'] if node['yum'][repo]['exclude']
enablegroups node['yum'][repo]['enablegroups'] if node['yum'][repo]['enablegroups']
failovermethod node['yum'][repo]['failovermethod'] if node['yum'][repo]['failovermethod']
http_caching node['yum'][repo]['http_caching'] if node['yum'][repo]['http_caching']
include_config node['yum'][repo]['include_config'] if node['yum'][repo]['include_config']
includepkgs node['yum'][repo]['includepkgs'] if node['yum'][repo]['includepkgs']
keepalive node['yum'][repo]['keepalive'] if node['yum'][repo]['keepalive']
max_retries node['yum'][repo]['max_retries'] if node['yum'][repo]['max_retries']
metadata_expire node['yum'][repo]['metadata_expire'] if node['yum'][repo]['metadata_expire']
mirror_expire node['yum'][repo]['mirror_expire'] if node['yum'][repo]['mirror_expire']
priority node['yum'][repo]['priority'] if node['yum'][repo]['priority']
proxy node['yum'][repo]['proxy'] if node['yum'][repo]['proxy']
proxy_username node['yum'][repo]['proxy_username'] if node['yum'][repo]['proxy_username']
proxy_password node['yum'][repo]['proxy_password'] if node['yum'][repo]['proxy_password']
repositoryid node['yum'][repo]['repositoryid'] if node['yum'][repo]['repositoryid']
sslcacert node['yum'][repo]['sslcacert'] if node['yum'][repo]['sslcacert']
sslclientcert node['yum'][repo]['sslclientcert'] if node['yum'][repo]['sslclientcert']
sslclientkey node['yum'][repo]['sslclientkey'] if node['yum'][repo]['sslclientkey']
sslverify node['yum'][repo]['sslverify'] if node['yum'][repo]['sslverify']
timeout node['yum'][repo]['timeout'] if node['yum'][repo]['timeout']
action :create
end
end
Expand Down

0 comments on commit c9773ac

Please sign in to comment.