summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Chamberland <chamberland.marc@gmail.com>2020-06-15 19:43:34 -0400
committerLance Albertson <lance@osuosl.org>2020-09-14 11:07:05 -0700
commite404dfa694f0bdb372731890f57d21b216456d02 (patch)
tree50d805b2482ea4be8ed900602484b0339166aecb
parent98cc1e854c5022cb637fe10433b06f796f1fd32a (diff)
downloadchef-e404dfa694f0bdb372731890f57d21b216456d02.tar.gz
fix a few new instances of Chef::Dist
Signed-off-by: Marc Chamberland <chamberland.marc@gmail.com> Signed-off-by: Lance Albertson <lance@osuosl.org>
-rw-r--r--lib/chef/resource/chef_client_scheduled_task.rb2
-rw-r--r--lib/chef/resource/homebrew_package.rb2
-rw-r--r--lib/chef/resource/hostname.rb4
-rw-r--r--lib/chef/resource/remote_file.rb6
4 files changed, 7 insertions, 7 deletions
diff --git a/lib/chef/resource/chef_client_scheduled_task.rb b/lib/chef/resource/chef_client_scheduled_task.rb
index 3450ff2329..9c9195ceb1 100644
--- a/lib/chef/resource/chef_client_scheduled_task.rb
+++ b/lib/chef/resource/chef_client_scheduled_task.rb
@@ -49,7 +49,7 @@ class Chef
end
```
- **Run #{Chef::Dist::PRODUCT} daily at 01:00 am, specifying a named run-list**:
+ **Run #{ChefUtils::Dist::Infra::PRODUCT} daily at 01:00 am, specifying a named run-list**:
```ruby
chef_client_scheduled_task "Run chef-client named run-list daily" do
diff --git a/lib/chef/resource/homebrew_package.rb b/lib/chef/resource/homebrew_package.rb
index 88c0fce98f..99730647fe 100644
--- a/lib/chef/resource/homebrew_package.rb
+++ b/lib/chef/resource/homebrew_package.rb
@@ -29,7 +29,7 @@ class Chef
provides :homebrew_package
provides :package, os: "darwin"
- description "Use the **homebrew_package** resource to manage packages for the macOS platform. Note: Starting with #{Chef::Dist::PRODUCT} 16 the homebrew resource now accepts an array of packages for installing multiple packages at once."
+ description "Use the **homebrew_package** resource to manage packages for the macOS platform. Note: Starting with #{ChefUtils::Dist::Infra::PRODUCT} 16 the homebrew resource now accepts an array of packages for installing multiple packages at once."
introduced "12.0"
examples <<~DOC
**Install a package**:
diff --git a/lib/chef/resource/hostname.rb b/lib/chef/resource/hostname.rb
index e76ea88e8d..a8044ec6ae 100644
--- a/lib/chef/resource/hostname.rb
+++ b/lib/chef/resource/hostname.rb
@@ -16,7 +16,7 @@
#
require_relative "../resource"
-require_relative "../dist"
+require "chef-utils/dist"
class Chef
class Resource
@@ -248,7 +248,7 @@ class Chef
# reboot because $windows
reboot "setting hostname" do
- reason "#{Chef::Dist::PRODUCT} updated system hostname"
+ reason "#{ChefUtils::Dist::Infra::PRODUCT} updated system hostname"
only_if { new_resource.windows_reboot }
action :request_reboot
end
diff --git a/lib/chef/resource/remote_file.rb b/lib/chef/resource/remote_file.rb
index d183fed64f..4ccf267143 100644
--- a/lib/chef/resource/remote_file.rb
+++ b/lib/chef/resource/remote_file.rb
@@ -22,7 +22,7 @@ require_relative "file"
require_relative "../provider/remote_file"
require_relative "../mixin/securable"
require_relative "../mixin/uris"
-require_relative "../dist"
+require "chef-utils/dist"
class Chef
class Resource
@@ -74,7 +74,7 @@ class Chef
end
property :checksum, String,
- description: "Optional, see `use_conditional_get`. The SHA-256 checksum of the file. Use to prevent a file from being re-downloaded. When the local file matches the checksum, #{Chef::Dist::PRODUCT} does not download it."
+ description: "Optional, see `use_conditional_get`. The SHA-256 checksum of the file. Use to prevent a file from being re-downloaded. When the local file matches the checksum, #{ChefUtils::Dist::Infra::PRODUCT} does not download it."
# Disable or enable ETag and Last Modified conditional GET. Equivalent to
# use_etag(true_or_false)
@@ -93,7 +93,7 @@ class Chef
description: "Enable `If-Modified-Since` headers. Set to `false` to disable `If-Modified-Since` headers. To use this setting, `use_conditional_get` must also be set to `true`."
property :ftp_active_mode, [ TrueClass, FalseClass ], default: false,
- description: "Whether #{Chef::Dist::PRODUCT} uses active or passive FTP. Set to `true` to use active FTP."
+ description: "Whether #{ChefUtils::Dist::Infra::PRODUCT} uses active or passive FTP. Set to `true` to use active FTP."
property :headers, Hash, default: lazy { {} },
description: "A Hash of custom HTTP headers."