From 007e6660be40488a3b81efd9be49795552939f0f Mon Sep 17 00:00:00 2001 From: Yvan Duhamel Date: Wed, 5 Jan 2022 11:34:41 +0100 Subject: [PATCH 1/2] Suppress a useless reboot that was triggered once a server joined the farm --- CHANGELOG.md | 3 +++ SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2cda8803..395cd82dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- SPFarm + - Suppress a useless reboot that was triggered once a server joined the farm + ## [5.0.0] - 2021-12-17 ### Added diff --git a/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 b/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 index f36ccc4db..368fc492f 100644 --- a/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 @@ -1239,10 +1239,7 @@ function Set-TargetResource Write-Verbose -Message ("Pausing for 5 minutes to allow the timer service to " + "fully provision the server") Start-Sleep -Seconds 300 - Write-Verbose -Message ("Join farm complete. Restarting computer to allow " + - "configuration to continue") - - $global:DSCMachineStatus = 1 + Write-Verbose -Message ("Join farm complete") } } } From 0284ce43febaece70b0be423b53d129631651182 Mon Sep 17 00:00:00 2001 From: Yvan Duhamel Date: Fri, 7 Jan 2022 16:46:05 +0100 Subject: [PATCH 2/2] Suppress a useless 5 minutes sleep triggered once a server joined the farm --- CHANGELOG.md | 1 + SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 395cd82dd..7d44848e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - SPFarm - Suppress a useless reboot that was triggered once a server joined the farm + - Suppress a useless 5 minutes sleep triggered once a server joined the farm ## [5.0.0] - 2021-12-17 diff --git a/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 b/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 index 368fc492f..641e9ac35 100644 --- a/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 @@ -1235,10 +1235,6 @@ function Set-TargetResource { Write-Verbose -Message "Starting timer service" Start-Service -Name sptimerv4 - - Write-Verbose -Message ("Pausing for 5 minutes to allow the timer service to " + - "fully provision the server") - Start-Sleep -Seconds 300 Write-Verbose -Message ("Join farm complete") } }