diff --git a/lib/puppet/provider/sqlserver.rb b/lib/puppet/provider/sqlserver.rb index 2ac2682c..5ac415ba 100644 --- a/lib/puppet/provider/sqlserver.rb +++ b/lib/puppet/provider/sqlserver.rb @@ -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") { @@ -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 diff --git a/lib/puppet_x/sqlserver/features.rb b/lib/puppet_x/sqlserver/features.rb index 57a8cf61..17921226 100644 --- a/lib/puppet_x/sqlserver/features.rb +++ b/lib/puppet_x/sqlserver/features.rb @@ -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