diff options
| author | Tim Smith <tsmith@chef.io> | 2016-09-14 15:18:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-14 15:18:27 -0700 |
| commit | 530c7b485f6201d4d9cbc706a5c6838d1d0ce1f1 (patch) | |
| tree | 0cd250cc72c5853512e84282b21de98a2a27b90a | |
| parent | 3faabd74883c5f5d8b311478b86e37c120ebe4d1 (diff) | |
| parent | 67e86dbcf0b702b5a9f2317a6df6ee1df4814038 (diff) | |
| download | chef-530c7b485f6201d4d9cbc706a5c6838d1d0ce1f1.tar.gz | |
Merge pull request #5320 from tas50/yum_repository_fix
Allow the :delete action for yum_repository + fix old property support
| -rw-r--r-- | lib/chef/resource/yum_repository.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/chef/resource/yum_repository.rb b/lib/chef/resource/yum_repository.rb index 4b3c6edfb7..3633f4421b 100644 --- a/lib/chef/resource/yum_repository.rb +++ b/lib/chef/resource/yum_repository.rb @@ -29,7 +29,7 @@ class Chef property :cost, String, regex: /^\d+$/ property :clean_headers, [TrueClass, FalseClass], default: false # deprecated property :clean_metadata, [TrueClass, FalseClass], default: true - property :description, String, regex: /.*/, default: "Ye Ole Rpm Repo" + property :description, String, regex: /.*/, default: "Yum Repository" property :enabled, [TrueClass, FalseClass], default: true property :enablegroups, [TrueClass, FalseClass] property :exclude, String, regex: /.*/ @@ -66,11 +66,14 @@ class Chef property :sslclientkey, String, regex: /.*/ property :sslverify, [TrueClass, FalseClass] property :timeout, String, regex: /^\d+$/ - property :options, Hash default_action :create - allowed_actions :create, :remove, :make_cache, :add + allowed_actions :create, :remove, :make_cache, :add, :delete + + # provide compatibility with the yum cookbook < 3.0 properties + alias_method :url, :baseurl + alias_method :keyurl, :gpgkey end end end |