diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chef/resource/ohai.rb | 2 | ||||
| -rw-r--r-- | lib/chef/resource/ruby_block.rb | 2 | ||||
| -rw-r--r-- | lib/chef/resource/service.rb | 2 | ||||
| -rw-r--r-- | lib/chef/resource/windows_ad_join.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/resource/ohai.rb b/lib/chef/resource/ohai.rb index 4dca91daea..164ef22b04 100644 --- a/lib/chef/resource/ohai.rb +++ b/lib/chef/resource/ohai.rb @@ -29,7 +29,7 @@ class Chef description "Use the ohai resource to reload the Ohai configuration on a node. This allows recipes that change system attributes (like a recipe that adds a user) to refer to those attributes later on during the #{Chef::Dist::CLIENT} run." property :plugin, String, - description: "The name of an Ohai plugin to be reloaded. If this property is not specified, the #{Chef::Dist::CLIENT} will reload all plugins." + description: "The name of an Ohai plugin to be reloaded. If this property is not specified, #{Chef::Dist::PRODUCT} will reload all plugins." default_action :reload allowed_actions :reload diff --git a/lib/chef/resource/ruby_block.rb b/lib/chef/resource/ruby_block.rb index c0cb4d95e4..4f5c7e4b95 100644 --- a/lib/chef/resource/ruby_block.rb +++ b/lib/chef/resource/ruby_block.rb @@ -26,7 +26,7 @@ class Chef class RubyBlock < Chef::Resource provides :ruby_block, target_mode: true - description "Use the ruby_block resource to execute Ruby code during a #{Chef::Dist::CLIENT} run."\ + description "Use the ruby_block resource to execute Ruby code during a #{Chef::Dist::PRODUCT} run."\ " Ruby code in the ruby_block resource is evaluated with other resources during"\ " convergence, whereas Ruby code outside of a ruby_block resource is evaluated"\ " before other resources, as the recipe is compiled." diff --git a/lib/chef/resource/service.rb b/lib/chef/resource/service.rb index f04e7b3c9c..dec7209fd0 100644 --- a/lib/chef/resource/service.rb +++ b/lib/chef/resource/service.rb @@ -35,7 +35,7 @@ class Chef # this is a poor API please do not re-use this pattern property :supports, Hash, default: { restart: nil, reload: nil, status: nil }, - description: "A list of properties that controls how the #{Chef::Dist::CLIENT} is to attempt to manage a service: :restart, :reload, :status. For :restart, the init script or other service provider can use a restart command; if :restart is not specified, the #{Chef::Dist::CLIENT} attempts to stop and then start a service. For :reload, the init script or other service provider can use a reload command. For :status, the init script or other service provider can use a status command to determine if the service is running; if :status is not specified, the #{Chef::Dist::CLIENT} attempts to match the service_name against the process table as a regular expression, unless a pattern is specified as a parameter property. Default value: { restart: false, reload: false, status: false } for all platforms (except for the Red Hat platform family, which defaults to { restart: false, reload: false, status: true }.)", + description: "A list of properties that controls how #{Chef::Dist::PRODUCT} is to attempt to manage a service: :restart, :reload, :status. For :restart, the init script or other service provider can use a restart command; if :restart is not specified, the #{Chef::Dist::CLIENT} attempts to stop and then start a service. For :reload, the init script or other service provider can use a reload command. For :status, the init script or other service provider can use a status command to determine if the service is running; if :status is not specified, the #{Chef::Dist::CLIENT} attempts to match the service_name against the process table as a regular expression, unless a pattern is specified as a parameter property. Default value: { restart: false, reload: false, status: false } for all platforms (except for the Red Hat platform family, which defaults to { restart: false, reload: false, status: true }.)", coerce: proc { |x| x.is_a?(Array) ? x.each_with_object({}) { |i, m| m[i] = true } : x } property :service_name, String, diff --git a/lib/chef/resource/windows_ad_join.rb b/lib/chef/resource/windows_ad_join.rb index 23faa60ee5..c0a84746b5 100644 --- a/lib/chef/resource/windows_ad_join.rb +++ b/lib/chef/resource/windows_ad_join.rb @@ -31,7 +31,7 @@ class Chef introduced "14.0" property :domain_name, String, - description: "The FQDN of the Active Directory domain to join if it differs from the resource block's name.", + description: "An optional property to set the FQDN of the Active Directory domain to join if it differs from the resource block's name.", validation_message: "The 'domain_name' property must be a FQDN.", regex: /.\../, # anything.anything name_property: true |