Skip to content

Commit

Permalink
Merge pull request #17 from rsWinAutomationSupport/staging
Browse files Browse the repository at this point in the history
Merge latest bug fix from staging
  • Loading branch information
Alexei Andreyev committed Jan 21, 2016
2 parents f02aa13 + 92a7a3b commit fa1cd3e
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 3 deletions.
Binary file modified DSCAutomation.psd1
Binary file not shown.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ A suite of tools for fully automated deployments of a DSC Pull server and its cl

### Changelog

#### 1.0.1
- Fix LCM CertificateID configuration on Pull server

#### 1.0.0
- Initial release closely based on the rsBoot POC by Rackspace Windows Automation team.
- Created a shared library of functions and cmdlets for use as part of the pull server and client management process
Expand Down
24 changes: 21 additions & 3 deletions bootstrap/boot.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -1136,11 +1136,29 @@ if ($PullServerConfig)
Write-Verbose "Starting Pull Server Boot DSC configuration run"
PullBoot -BootParameters $BootParameters -OutputPath $DSCbootMofFolder

Write-Verbose "Applying initial Pull Server boot LCM configuration"
Set-DscLocalConfigurationManager -Path $DSCbootMofFolder -Verbose

Write-Verbose "Applying initial Pull Server Boot configuration"
Start-DscConfiguration -Path $DSCbootMofFolder -Wait -Verbose -Force

Write-Verbose "Configuring Pull Server LCM"
Configuration PullLCM
{
param
(
[hashtable] $BootParameters
)
Node $env:COMPUTERNAME
{
LocalConfigurationManager
{
AllowModuleOverwrite = 'True'
CertificateID = (Get-ChildItem Cert:\LocalMachine\My | Where-Object Subject -EQ "CN=$($BootParameters.PullServerAddress)").Thumbprint
ConfigurationMode = 'ApplyAndAutoCorrect'
RebootNodeIfNeeded = 'True'
}
}
}
PullLCM -BootParameters $BootParameters -OutputPath $DSCbootMofFolder -Verbose
Set-DscLocalConfigurationManager -Path $DSCbootMofFolder -Verbose

Write-Verbose "Running DSC config to install extra DSC modules as defined in rsPlatform"
Install-PlatformModules
Expand Down

0 comments on commit fa1cd3e

Please sign in to comment.