diff options
| author | Tim Smith <tsmith@chef.io> | 2020-09-04 14:27:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 14:27:00 -0700 |
| commit | f4e90cf0f789596da1dddc3f68b6de25462262af (patch) | |
| tree | 91aced7183bff9be6f71ac29d213de730c93eecc | |
| parent | c18707c0cdb6a92844139ea6642abcc55a9f2b37 (diff) | |
| parent | a02be82b7a0b4e8794f3211177f4536a03d4ccc1 (diff) | |
| download | chef-f4e90cf0f789596da1dddc3f68b6de25462262af.tar.gz | |
Merge pull request #10388 from chef-davin/windows_ad_join-update
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | lib/chef/resource/windows_ad_join.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/chef/resource/windows_ad_join.rb b/lib/chef/resource/windows_ad_join.rb index 40bf6ed3bb..d46a5399e5 100644 --- a/lib/chef/resource/windows_ad_join.rb +++ b/lib/chef/resource/windows_ad_join.rb @@ -80,6 +80,11 @@ class Chef description: "Controls the system reboot behavior post domain joining. Reboot immediately, after the #{Chef::Dist::PRODUCT} run completes, or never. Note that a reboot is necessary for changes to take effect.", default: :immediate + property :reboot_delay, Integer, + description: "The amount of time (in minutes) to delay a reboot request.", + default: 0, + introduced: "16.5" + property :new_hostname, String, description: "Specifies a new hostname for the computer in the new domain.", introduced: "14.5" @@ -116,6 +121,7 @@ class Chef unless new_resource.reboot == :never reboot "Reboot to join domain #{new_resource.domain_name}" do action clarify_reboot(new_resource.reboot) + delay_mins new_resource.reboot_delay reason "Reboot to join domain #{new_resource.domain_name}" end end @@ -149,6 +155,7 @@ class Chef unless new_resource.reboot == :never reboot "Reboot to leave domain #{new_resource.domain_name}" do action clarify_reboot(new_resource.reboot) + delay_mins new_resource.reboot_delay reason "Reboot to leave domain #{new_resource.domain_name}" end end |