chef 14.6.47-universal-mingw32 → 14.7.17-universal-mingw32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (90) hide show
  1. checksums.yaml +4 -4
  2. data/chef-universal-mingw32.gemspec +1 -0
  3. data/lib/chef/application/apply.rb +6 -4
  4. data/lib/chef/knife/config_list_profiles.rb +1 -1
  5. data/lib/chef/knife/list.rb +1 -1
  6. data/lib/chef/knife/raw.rb +1 -1
  7. data/lib/chef/knife/role_env_run_list_clear.rb +1 -1
  8. data/lib/chef/knife/role_env_run_list_remove.rb +1 -1
  9. data/lib/chef/knife/role_env_run_list_replace.rb +1 -1
  10. data/lib/chef/knife/role_env_run_list_set.rb +1 -1
  11. data/lib/chef/knife/role_run_list_clear.rb +1 -1
  12. data/lib/chef/knife/role_run_list_remove.rb +1 -1
  13. data/lib/chef/knife/role_run_list_replace.rb +1 -1
  14. data/lib/chef/knife/role_run_list_set.rb +1 -1
  15. data/lib/chef/knife/show.rb +1 -1
  16. data/lib/chef/knife/upload.rb +1 -1
  17. data/lib/chef/knife/xargs.rb +1 -1
  18. data/lib/chef/node/attribute.rb +189 -185
  19. data/lib/chef/platform/rebooter.rb +1 -0
  20. data/lib/chef/property.rb +25 -1
  21. data/lib/chef/provider/windows_task.rb +19 -6
  22. data/lib/chef/resource.rb +17 -2
  23. data/lib/chef/resource/apt_preference.rb +2 -1
  24. data/lib/chef/resource/apt_repository.rb +1 -1
  25. data/lib/chef/resource/apt_update.rb +1 -0
  26. data/lib/chef/resource/build_essential.rb +1 -1
  27. data/lib/chef/resource/cab_package.rb +1 -1
  28. data/lib/chef/resource/chef_gem.rb +1 -1
  29. data/lib/chef/resource/cookbook_file.rb +2 -1
  30. data/lib/chef/resource/cron_d.rb +1 -1
  31. data/lib/chef/resource/dmg_package.rb +52 -40
  32. data/lib/chef/resource/execute.rb +2 -2
  33. data/lib/chef/resource/file.rb +1 -1
  34. data/lib/chef/resource/group.rb +2 -2
  35. data/lib/chef/resource/homebrew_cask.rb +3 -2
  36. data/lib/chef/resource/homebrew_tap.rb +2 -2
  37. data/lib/chef/resource/hostname.rb +2 -2
  38. data/lib/chef/resource/kernel_module.rb +19 -13
  39. data/lib/chef/resource/locale.rb +1 -0
  40. data/lib/chef/resource/macos_userdefaults.rb +7 -6
  41. data/lib/chef/resource/mdadm.rb +3 -2
  42. data/lib/chef/resource/mount.rb +3 -3
  43. data/lib/chef/resource/openssl_dhparam.rb +1 -1
  44. data/lib/chef/resource/openssl_ec_private_key.rb +1 -1
  45. data/lib/chef/resource/openssl_ec_public_key.rb +3 -3
  46. data/lib/chef/resource/openssl_rsa_private_key.rb +2 -2
  47. data/lib/chef/resource/openssl_rsa_public_key.rb +3 -3
  48. data/lib/chef/resource/openssl_x509_certificate.rb +1 -1
  49. data/lib/chef/resource/openssl_x509_crl.rb +1 -1
  50. data/lib/chef/resource/openssl_x509_request.rb +1 -1
  51. data/lib/chef/resource/package.rb +1 -1
  52. data/lib/chef/resource/powershell_package.rb +1 -1
  53. data/lib/chef/resource/remote_directory.rb +2 -2
  54. data/lib/chef/resource/rhsm_errata.rb +1 -1
  55. data/lib/chef/resource/rhsm_errata_level.rb +1 -1
  56. data/lib/chef/resource/rhsm_register.rb +7 -7
  57. data/lib/chef/resource/rhsm_repo.rb +1 -1
  58. data/lib/chef/resource/rhsm_subscription.rb +1 -1
  59. data/lib/chef/resource/sudo.rb +8 -8
  60. data/lib/chef/resource/swap_file.rb +1 -1
  61. data/lib/chef/resource/sysctl.rb +2 -2
  62. data/lib/chef/resource/systemd_unit.rb +19 -11
  63. data/lib/chef/resource/timezone.rb +60 -32
  64. data/lib/chef/resource/windows_ad_join.rb +1 -1
  65. data/lib/chef/resource/windows_auto_run.rb +1 -1
  66. data/lib/chef/resource/windows_certificate.rb +269 -0
  67. data/lib/chef/resource/windows_env.rb +12 -3
  68. data/lib/chef/resource/windows_feature.rb +6 -11
  69. data/lib/chef/resource/windows_feature_dism.rb +2 -2
  70. data/lib/chef/resource/windows_feature_powershell.rb +5 -9
  71. data/lib/chef/resource/windows_firewall_rule.rb +205 -0
  72. data/lib/chef/resource/windows_path.rb +3 -1
  73. data/lib/chef/resource/windows_printer.rb +2 -2
  74. data/lib/chef/resource/windows_printer_port.rb +3 -3
  75. data/lib/chef/resource/windows_service.rb +1 -0
  76. data/lib/chef/resource/windows_share.rb +315 -0
  77. data/lib/chef/resource/windows_task.rb +4 -0
  78. data/lib/chef/resource/windows_workgroup.rb +6 -4
  79. data/lib/chef/resource/yum_repository.rb +13 -7
  80. data/lib/chef/resource/zypper_package.rb +2 -2
  81. data/lib/chef/resource/zypper_repository.rb +2 -1
  82. data/lib/chef/resource_inspector.rb +4 -4
  83. data/lib/chef/resources.rb +3 -0
  84. data/lib/chef/version.rb +1 -1
  85. data/spec/functional/resource/windows_task_spec.rb +39 -0
  86. data/spec/support/platform_helpers.rb +2 -1
  87. data/spec/unit/resource/windows_certificate.rb +46 -0
  88. data/spec/unit/resource/windows_firewall_rule_spec.rb +401 -0
  89. data/spec/unit/resource/windows_share.rb +39 -0
  90. metadata +24 -4
@@ -36,7 +36,7 @@ class Chef
36
36
 
37
37
  property :members, [String, Array], default: lazy { [] },
38
38
  coerce: proc { |arg| arg.is_a?(String) ? arg.split(/\s*,\s*/) : arg },
39
- description: "Which users should be set or appended to a group. This can be either an array or a comma separated list."
39
+ description: "Which users should be set or appended to a group. When more than one group member is identified, the list of members should be an array: members ['user1', 'user2']."
40
40
 
41
41
  property :excluded_members, [String, Array], default: lazy { [] },
42
42
  coerce: proc { |arg| arg.is_a?(String) ? arg.split(/\s*,\s*/) : arg },
@@ -46,7 +46,7 @@ class Chef
46
46
  description: "How members should be appended and/or removed from a group. When true, members are appended and excluded_members are removed. When false, group members are reset to the value of the members property."
47
47
 
48
48
  property :system, [ TrueClass, FalseClass ], default: false,
49
- description: "Sets the group to belong to the system group."
49
+ description: "Set if a group belongs to a system group. Set to true if the group belongs to a system group."
50
50
 
51
51
  property :non_unique, [ TrueClass, FalseClass ], default: false,
52
52
  description: "Allow gid duplication. May only be used with the Groupadd provider."
@@ -34,10 +34,11 @@ class Chef
34
34
  property :cask_name, String,
35
35
  description: "The name of the Homebrew cask, if it differs from the resource block name.",
36
36
  regex: %r{^[\w/-]+$},
37
+ validation_message: "The provided Homebrew cask name is not valid. Cask names can contain alphanumeric characters, _, -, or / only!",
37
38
  name_property: true
38
39
 
39
40
  property :options, String,
40
- description: "Options to pass to the brew CLI during installation."
41
+ description: "Options to pass to the brew command during installation."
41
42
 
42
43
  property :install_cask, [TrueClass, FalseClass],
43
44
  description: "Automatically install the Homebrew cask tap, if necessary.",
@@ -48,7 +49,7 @@ class Chef
48
49
  default: "/usr/local/bin/brew"
49
50
 
50
51
  property :owner, String,
51
- description: "The owner of the homebrew installation.",
52
+ description: "The owner of the Homebrew installation.",
52
53
  default: lazy { find_homebrew_username }
53
54
 
54
55
  action :install do
@@ -33,12 +33,12 @@ class Chef
33
33
 
34
34
  property :tap_name, String,
35
35
  description: "Optional tap name to override the resource name",
36
- validation_message: "Homebrew tap names must be in the form REPO/TAP",
36
+ validation_message: "Homebrew tap names must be in the form REPO/TAP format!",
37
37
  regex: %r{^[\w-]+(?:\/[\w-]+)+$},
38
38
  name_property: true
39
39
 
40
40
  property :url, String,
41
- description: "URL to the tap."
41
+ description: "The URL of the tap."
42
42
 
43
43
  property :full, [TrueClass, FalseClass],
44
44
  description: "Perform a full clone on the tap, as opposed to a shallow clone.",
@@ -27,12 +27,12 @@ class Chef
27
27
  introduced "14.0"
28
28
 
29
29
  property :hostname, String,
30
- description: "Used to specify the hostname if it is different than the resources name.",
30
+ description: "Used to specify the hostname if it is different than the resource's name.",
31
31
  name_property: true
32
32
 
33
33
  property :compile_time, [ TrueClass, FalseClass ],
34
34
  description: "Determines whether or not the resource shoul be run at compile time.",
35
- default: true
35
+ default: true, desired_state: false
36
36
 
37
37
  property :ipaddress, String,
38
38
  description: "The IP address to use when configuring the hosts file.",
@@ -41,12 +41,14 @@ class Chef
41
41
 
42
42
  file "#{new_resource.load_dir}/#{new_resource.modname}.conf" do
43
43
  content "#{new_resource.modname}\n"
44
- notifies :run, "execute[update initramfs]"
44
+ notifies :run, "execute[update initramfs]", :delayed
45
45
  end
46
46
 
47
- execute "update initramfs" do
48
- command initramfs_command
49
- action :nothing
47
+ with_run_context :root do
48
+ find_resource(:execute, "update initramfs") do
49
+ command initramfs_command
50
+ action :nothing
51
+ end
50
52
  end
51
53
  end
52
54
 
@@ -55,17 +57,19 @@ class Chef
55
57
 
56
58
  file "#{new_resource.load_dir}/#{new_resource.modname}.conf" do
57
59
  action :delete
58
- notifies :run, "execute[update initramfs]"
60
+ notifies :run, "execute[update initramfs]", :delayed
59
61
  end
60
62
 
61
63
  file "#{new_resource.unload_dir}/blacklist_#{new_resource.modname}.conf" do
62
64
  action :delete
63
- notifies :run, "execute[update initramfs]"
65
+ notifies :run, "execute[update initramfs]", :delayed
64
66
  end
65
67
 
66
- execute "update initramfs" do
67
- command initramfs_command
68
- action :nothing
68
+ with_run_context :root do
69
+ find_resource(:execute, "update initramfs") do
70
+ command initramfs_command
71
+ action :nothing
72
+ end
69
73
  end
70
74
 
71
75
  new_resource.run_action(:unload)
@@ -76,12 +80,14 @@ class Chef
76
80
 
77
81
  file "#{new_resource.unload_dir}/blacklist_#{new_resource.modname}.conf" do
78
82
  content "blacklist #{new_resource.modname}"
79
- notifies :run, "execute[update initramfs]"
83
+ notifies :run, "execute[update initramfs]", :delayed
80
84
  end
81
85
 
82
- execute "update initramfs" do
83
- command initramfs_command
84
- action :nothing
86
+ with_run_context :root do
87
+ find_resource(:execute, "update initramfs") do
88
+ command initramfs_command
89
+ action :nothing
90
+ end
85
91
  end
86
92
 
87
93
  new_resource.run_action(:unload)
@@ -29,6 +29,7 @@ class Chef
29
29
  property :lang, String,
30
30
  default: "en_US.utf8",
31
31
  description: "Sets the default system language."
32
+
32
33
  property :lc_all, String,
33
34
  default: "en_US.utf8",
34
35
  description: "Sets the fallback system language."
@@ -29,11 +29,11 @@ class Chef
29
29
  introduced "14.0"
30
30
 
31
31
  property :domain, String,
32
- description: "The domain the defaults belong to.",
32
+ description: "The domain that the user defaults belong to.",
33
33
  required: true
34
34
 
35
35
  property :global, [TrueClass, FalseClass],
36
- description: "Whether the domain is global.",
36
+ description: "Determines whether or not the domain is global.",
37
37
  default: false
38
38
 
39
39
  property :key, String,
@@ -44,21 +44,22 @@ class Chef
44
44
  required: true
45
45
 
46
46
  property :type, String,
47
- description: "Value type of the preference key.",
47
+ description: "The value type of the preference key.",
48
48
  default: ""
49
49
 
50
50
  property :user, String,
51
- description: "User for which to set the default."
51
+ description: "The system user that the default will be applied to."
52
52
 
53
53
  property :sudo, [TrueClass, FalseClass],
54
- description: "Set to true if the setting requires privileged access to modify.",
54
+ description: "Set to true if the setting you wish to modify requires privileged access.",
55
55
  default: false,
56
56
  desired_state: false
57
57
 
58
58
  # @todo this should get refactored away: https://github.com/chef/chef/issues/7622
59
59
  property :is_set, [TrueClass, FalseClass],
60
60
  default: false,
61
- desired_state: false
61
+ desired_state: false,
62
+ skip_docs: true
62
63
 
63
64
  # coerce various ways of representing a boolean into either 0 (false) or 1 (true)
64
65
  # which is what the defaults CLI expects. Why? Well defaults itself accepts a few
@@ -40,9 +40,10 @@ class Chef
40
40
  default: lazy { [] },
41
41
  description: "The devices to be part of a RAID array."
42
42
 
43
+ # @todo this should get refactored away
43
44
  property :exists, [ TrueClass, FalseClass ],
44
45
  default: false,
45
- description: "Indicates whether the RAID array exists."
46
+ skip_docs: true
46
47
 
47
48
  property :level, Integer,
48
49
  default: 1,
@@ -57,7 +58,7 @@ class Chef
57
58
 
58
59
  property :raid_device, String,
59
60
  identity: true, name_property: true,
60
- description: "The name of the RAID device. We'll use the resource's name if this isn't specified."
61
+ description: "An optional property to specify the name of the RAID device if it differs from the resource block's name."
61
62
 
62
63
  property :layout, String,
63
64
  description: "The RAID5 parity algorithm. Possible values: left-asymmetric (or la), left-symmetric (or ls), right-asymmetric (or ra), or right-symmetric (or rs)."
@@ -1,7 +1,7 @@
1
1
  #
2
2
  # Author:: Joshua Timberman (<joshua@chef.io>)
3
3
  # Author:: Tyler Cloke (<tyler@chef.io>)
4
- # Copyright:: Copyright 2009-2017, Chef Software Inc.
4
+ # Copyright:: Copyright 2009-2018, Chef Software Inc.
5
5
  # License:: Apache License, Version 2.0
6
6
  #
7
7
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,7 +28,7 @@ class Chef
28
28
  allowed_actions :mount, :umount, :unmount, :remount, :enable, :disable
29
29
 
30
30
  # this is a poor API please do not re-use this pattern
31
- property :supports, Hash,
31
+ property :supports, [Array, Hash],
32
32
  description: "Specify a Hash of supported mount features.",
33
33
  default: lazy { { remount: false } },
34
34
  coerce: proc { |x| x.is_a?(Array) ? x.each_with_object({}) { |i, m| m[i] = true } : x }
@@ -50,7 +50,7 @@ class Chef
50
50
  equal_to: RUBY_PLATFORM =~ /solaris/i ? %i{ device } : %i{ device label uuid }
51
51
 
52
52
  # @todo this should get refactored away: https://github.com/chef/chef/issues/7621
53
- property :mounted, [TrueClass, FalseClass], default: false
53
+ property :mounted, [TrueClass, FalseClass], default: false, skip_docs: true
54
54
 
55
55
  property :fsck_device, String,
56
56
  description: "Solaris only: The fsck device.",
@@ -30,7 +30,7 @@ class Chef
30
30
  introduced "14.0"
31
31
 
32
32
  property :path, String,
33
- description: "The path to write the file to if it's different than the resource name.",
33
+ description: "An optional property for specifying the path to write the file to if it differs from the resource block's name.",
34
34
  name_property: true
35
35
 
36
36
  property :key_length, Integer,
@@ -31,7 +31,7 @@ class Chef
31
31
  introduced "14.4"
32
32
 
33
33
  property :path, String,
34
- description: "The path to write the file to it's different than the resource name.",
34
+ description: "An optional property for specifying the path to write the file to if it differs from the resource block's name.",
35
35
  name_property: true
36
36
 
37
37
  property :key_curve, String,
@@ -27,18 +27,18 @@ class Chef
27
27
  preview_resource true
28
28
  resource_name :openssl_ec_public_key
29
29
 
30
- description "Use the openssl_ec_public_key resource to generate elliptic curve (EC) public key files given a private key."
30
+ description "Use the openssl_ec_public_key resource to generate elliptic curve (EC) public key files from a given EC private key."
31
31
  introduced "14.4"
32
32
 
33
33
  property :path, String,
34
- description: "The path to write the file to if different than the resource's name.",
34
+ description: "An optional property for specifying the path to write the file to if it differs from the resource block's name.",
35
35
  name_property: true
36
36
 
37
37
  property :private_key_path, String,
38
38
  description: "The path to the private key file."
39
39
 
40
40
  property :private_key_content, String,
41
- description: "The content of the private key including new lines. This property is used in place of private_key_path to avoid having to first write a key to disk."
41
+ description: "The content of the private key including new lines. This property is used in place of private_key_path in instances where you want to avoid having to first write the private key to disk"
42
42
 
43
43
  property :private_key_pass, String,
44
44
  description: "The passphrase of the provided private key."
@@ -31,12 +31,12 @@ class Chef
31
31
  introduced "14.0"
32
32
 
33
33
  property :path, String,
34
- description: "The path to write the file to it's different than the resource name.",
34
+ description: "An optional property for specifying the path to write the file to if it differs from the resource block's name.",
35
35
  name_property: true
36
36
 
37
37
  property :key_length, Integer,
38
38
  equal_to: [1024, 2048, 4096, 8192],
39
- validation_message: "key_length (bits) must be 1024, 2048, 4096, or 8192.",
39
+ validation_message: "key_length (bits) must be 1024, 2048, 4096, or 8192!",
40
40
  description: "The desired bit length of the generated key.",
41
41
  default: 2048
42
42
 
@@ -26,18 +26,18 @@ class Chef
26
26
  resource_name :openssl_rsa_public_key
27
27
  provides(:openssl_rsa_public_key) { true }
28
28
 
29
- description "Use the openssl_rsa_public_key resource to generate RSA public key files given a RSA private key."
29
+ description "Use the openssl_rsa_public_key resource to generate RSA public key files for a given RSA private key."
30
30
  introduced "14.0"
31
31
 
32
32
  property :path, String,
33
- description: "The path to write the file to if different than the resource's name.",
33
+ description: "An optional property for specifying the path to the public key if it differs from the resource block's name.",
34
34
  name_property: true
35
35
 
36
36
  property :private_key_path, String,
37
37
  description: "The path to the private key file."
38
38
 
39
39
  property :private_key_content, String,
40
- description: "The content of the private key including new lines. This property is used in place of private_key_path to avoid having to first write a key to disk."
40
+ description: "The content of the private key, including new lines. This property is used in place of private_key_path in instances where you want to avoid having to first write the private key to disk."
41
41
 
42
42
  property :private_key_pass, String,
43
43
  description: "The passphrase of the provided private key."
@@ -32,7 +32,7 @@ class Chef
32
32
  introduced "14.4"
33
33
 
34
34
  property :path, String,
35
- description: "Optional path to write the file to if you'd like to specify it here instead of in the resource name.",
35
+ description: "An optional property for specifying the path to write the file to if it differs from the resource block's name.",
36
36
  name_property: true
37
37
 
38
38
  property :owner, String,
@@ -31,7 +31,7 @@ class Chef
31
31
  introduced "14.4"
32
32
 
33
33
  property :path, String,
34
- description: "Optional path to write the file to if you'd like to specify it here instead of in the resource name.",
34
+ description: "An optional property for specifying the path to write the file to if it differs from the resource block's name.",
35
35
  name_property: true
36
36
 
37
37
  property :serial_to_revoke, [Integer, String],
@@ -31,7 +31,7 @@ class Chef
31
31
  introduced "14.4"
32
32
 
33
33
  property :path, String, name_property: true,
34
- description: "The optional path to write the file to if you'd like to specify it here instead of in the resource name."
34
+ description: "An optional property for specifying the path to write the file to if it differs from the resource block's name."
35
35
 
36
36
  property :owner, String,
37
37
  description: "The owner applied to all files created by the resource."
@@ -61,7 +61,7 @@ class Chef
61
61
  default: lazy { Hash.new }, desired_state: false
62
62
 
63
63
  property :source, String,
64
- description: "The direct path to a the package on the host.",
64
+ description: "The optional path to a package on the local file system.",
65
65
  desired_state: false
66
66
 
67
67
  property :timeout, [ String, Integer ],
@@ -45,7 +45,7 @@ class Chef
45
45
 
46
46
  property :skip_publisher_check, [true, false],
47
47
  description: "Skip validating module author.",
48
- default: false, introduced: "14.3"
48
+ default: false, introduced: "14.3", desired_state: false
49
49
 
50
50
  end
51
51
  end
@@ -56,8 +56,8 @@ class Chef
56
56
  property :source, String, default: lazy { ::File.basename(path) }
57
57
  property :files_backup, [ Integer, FalseClass ], default: 5, desired_state: false
58
58
  property :purge, [ TrueClass, FalseClass ], default: false, desired_state: false
59
- property :overwrite, [ TrueClass, FalseClass ], default: true
60
- property :cookbook, String
59
+ property :overwrite, [ TrueClass, FalseClass ], default: true, desired_state: false
60
+ property :cookbook, String, desired_state: false
61
61
 
62
62
  def files_group(arg = nil)
63
63
  set_or_return(
@@ -29,7 +29,7 @@ class Chef
29
29
  introduced "14.0"
30
30
 
31
31
  property :errata_id, String,
32
- description: "An optional property for specifying the errata ID if not using the resource's name.",
32
+ description: "An optional property for specifying the errata ID if it differs from the resource block's name.",
33
33
  name_property: true
34
34
 
35
35
  action :install do
@@ -29,7 +29,7 @@ class Chef
29
29
  property :errata_level, String,
30
30
  coerce: proc { |x| x.downcase },
31
31
  equal_to: %w{critical moderate important low},
32
- description: "The errata level of packages to install.",
32
+ description: "An optional property for specifying the errata level of packages to install if it differs from the resource block's name.",
33
33
  name_property: true
34
34
 
35
35
  action :install do
@@ -30,22 +30,22 @@ class Chef
30
30
 
31
31
  property :activation_key, [String, Array],
32
32
  coerce: proc { |x| Array(x) },
33
- description: "A String or array of the activation keys to use when registering. You must also specify the organization property if using activation_key."
33
+ description: "A string or array of activation keys to use when registering; you must also specify the 'organization' property when using this property."
34
34
 
35
35
  property :satellite_host, String,
36
- description: "The FQDN of the Satellite host to register with. If not specified, the host will be registered with Red Hat's public RHSM service."
36
+ description: "The FQDN of the Satellite host to register with. If this property is not specified, the host will register with Red Hat's public RHSM service."
37
37
 
38
38
  property :organization, String,
39
- description: "The organization to use when registering, required when using an activation key."
39
+ description: "The organization to use when registering; required when using the 'activation_key' property."
40
40
 
41
41
  property :environment, String,
42
- description: "The environment to use when registering, required when using username and password."
42
+ description: "The environment to use when registering; required when using the username and password properties."
43
43
 
44
44
  property :username, String,
45
- description: "The username to use when registering. Not applicable if using an activation key. If specified, password and environment are also required."
45
+ description: "The username to use when registering. This property is not applicable if using an activation key. If specified, password and environment properties are also required."
46
46
 
47
47
  property :password, String,
48
- description: "The password to use when registering. Not applicable if using an activation key. If specified, username and environment are also required."
48
+ description: "The password to use when registering. This property is not applicable if using an activation key. If specified, username and environment are also required."
49
49
 
50
50
  property :auto_attach,
51
51
  [TrueClass, FalseClass],
@@ -57,7 +57,7 @@ class Chef
57
57
  default: true
58
58
 
59
59
  property :force, [TrueClass, FalseClass],
60
- description: "If true, the system will be registered even if it is already registered. Normally, any register operations will fail if the machine is has already registered.",
60
+ description: "If true, the system will be registered even if it is already registered. Normally, any register operations will fail if the machine has already been registered.",
61
61
  default: false, desired_state: false
62
62
 
63
63
  action :register do
@@ -28,7 +28,7 @@ class Chef
28
28
  introduced "14.0"
29
29
 
30
30
  property :repo_name, String,
31
- description: "An optional property for specifying the repository name if not using the resource's name.",
31
+ description: "An optional property for specifying the repository name if it differs from the resource block's name.",
32
32
  name_property: true
33
33
 
34
34
  action :enable do
@@ -29,7 +29,7 @@ class Chef
29
29
  introduced "14.0"
30
30
 
31
31
  property :pool_id, String,
32
- description: "An optional property for specifying the Pool ID if not using the resource's name.",
32
+ description: "An optional property for specifying the Pool ID if it differs from the resource block's name.",
33
33
  name_property: true
34
34
 
35
35
  action :attach do