summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-09-21 20:42:20 -0700
committerTim Smith <tsmith@chef.io>2017-09-21 20:42:20 -0700
commitf3605a53528a262a0367e47d2303cb49e7d5e35d (patch)
tree204ce29dca76d6be47d7e2f487277ce79581d910
parent8b91c383a5e88d5039163831f50f8bc42673bb61 (diff)
downloadchef-f3605a53528a262a0367e47d2303cb49e7d5e35d.tar.gz
Sort yum repository options alphabetically
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--lib/chef/resource/yum_repository.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/chef/resource/yum_repository.rb b/lib/chef/resource/yum_repository.rb
index f59ad56d16..54a0a96aad 100644
--- a/lib/chef/resource/yum_repository.rb
+++ b/lib/chef/resource/yum_repository.rb
@@ -26,9 +26,9 @@ class Chef
# http://linux.die.net/man/5/yum.conf
property :baseurl, [String, Array], regex: /.*/
- property :cost, String, regex: /^\d+$/
property :clean_headers, [TrueClass, FalseClass], default: false # deprecated
property :clean_metadata, [TrueClass, FalseClass], default: true
+ property :cost, String, regex: /^\d+$/
property :description, String, regex: /.*/, default: "Yum Repository"
property :enabled, [TrueClass, FalseClass], default: true
property :enablegroups, [TrueClass, FalseClass]
@@ -44,17 +44,17 @@ class Chef
property :make_cache, [TrueClass, FalseClass], default: true
property :max_retries, [String, Integer]
property :metadata_expire, String, regex: [/^\d+$/, /^\d+[mhd]$/, /never/]
- property :mirrorexpire, String, regex: /.*/
- property :mirrorlist, String, regex: /.*/
property :mirror_expire, String, regex: [/^\d+$/, /^\d+[mhd]$/]
+ property :mirrorexpire, String, regex: /.*/
property :mirrorlist_expire, String, regex: [/^\d+$/, /^\d+[mhd]$/]
+ property :mirrorlist, String, regex: /.*/
property :mode, default: "0644"
+ property :options, Hash
+ property :password, String, regex: /.*/
property :priority, String, regex: /^(\d?[0-9]|[0-9][0-9])$/
- property :proxy, String, regex: /.*/
- property :proxy_username, String, regex: /.*/
property :proxy_password, String, regex: /.*/
- property :username, String, regex: /.*/
- property :password, String, regex: /.*/
+ property :proxy_username, String, regex: /.*/
+ property :proxy, String, regex: /.*/
property :repo_gpgcheck, [TrueClass, FalseClass]
property :report_instanceid, [TrueClass, FalseClass]
property :repositoryid, String, regex: /.*/, name_property: true
@@ -65,7 +65,7 @@ class Chef
property :sslclientkey, String, regex: /.*/
property :sslverify, [TrueClass, FalseClass]
property :timeout, String, regex: /^\d+$/
- property :options, Hash
+ property :username, String, regex: /.*/
default_action :create
allowed_actions :create, :remove, :makecache, :add, :delete