Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/puppet/provider/sqlserver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def self.run_install_dot_net(source_location = nil)
Else
{
Write-Host "Installing .Net Framework 3.5, do not close this prompt..."
DISM /Online /Enable-Feature /FeatureName:NetFx3 /All /NoRestart /Quiet /LimitAccess #{ "/Source:\"#{source_location}\"" unless source_location.nil? } | Out-Null
$InstallResult = DISM /Online /Enable-Feature /FeatureName:NetFx3 /All /NoRestart /Quiet /LimitAccess #{ "/Source:\"#{source_location}\"" unless source_location.nil? }
$Result = Dism /online /Get-featureinfo /featurename:NetFx3
If($Result -contains "State : Enabled")
{
Expand All @@ -68,6 +68,10 @@ def self.run_install_dot_net(source_location = nil)
Else
{
Write-Host "Failed to install Install .Net Framework 3.5#{ ", please make sure the windows_feature_source is correct" unless source_location.nil?}."
Write-Host "DISM Install Result"
Write-Host "-----------"
Write-Host ($InstallResult -join "`n")
#exit 1
}
}
DOTNET
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet_x/sqlserver/features.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
SQL_2014 ||= 'SQL_2014'
SQL_2016 ||= 'SQL_2016'

ALL_SQL_VERSIONS = [SQL_2012, SQL_2014, SQL_2016]
ALL_SQL_VERSIONS ||= [SQL_2012, SQL_2014, SQL_2016]

module PuppetX
module Sqlserver
Expand Down