Skip to content

Commit 19a73f7

Browse files
author
jordanbreen28
committed
(Bug) - Remove default switch of updateenabled false
1 parent b2c6300 commit 19a73f7

File tree

8 files changed

+7
-8
lines changed

8 files changed

+7
-8
lines changed

lib/puppet/provider/sqlserver_features/mssql.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ def modify_features(action, features)
6767
'/IACCEPTSQLSERVERLICENSETERMS',
6868
"/FEATURES=#{features.join(',')}"]
6969
if action == 'install'
70-
cmd_args << '/UPDATEENABLED=False'
7170
cmd_args << "/ISSVCACCOUNT=#{@resource[:is_svc_account]}" if not_nil_and_not_empty?(@resource[:is_svc_account])
7271
cmd_args << "/ISSVCPASSWORD=#{@resource[:is_svc_password]}" if not_nil_and_not_empty?(@resource[:is_svc_password])
7372
cmd_args << "/PID=#{@resource[:pid]}" if not_nil_and_not_empty?(@resource[:pid])

lib/puppet/provider/sqlserver_instance/mssql.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ def basic_cmd_args(features, action)
142142
'/IACCEPTSQLSERVERLICENSETERMS',
143143
"/INSTANCENAME=#{@resource[:name]}"]
144144
cmd_args << "/FEATURES=#{features.join(',')}" unless features.empty?
145-
cmd_args << '/UPDATEENABLED=False' if action == 'install'
146145
cmd_args
147146
end
148147

spec/acceptance/sqlserver_config_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ def ensure_sqlserver_instance(inst_name, ensure_val = 'present')
2222
sa_pwd => 'Pupp3t1@',
2323
windows_feature_source => 'I:\\sources\\sxs',
2424
install_switches => {
25+
'UpdateEnabled' => 'false',
2526
'SkipInstallerRunCheck' => 'True',
2627
},
2728
}

spec/acceptance/sqlserver_instance_spec.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ def ensure_sqlserver_instance(features, inst_name, ensure_val = 'present', sysad
3030
agt_svc_account => '#{user}',
3131
agt_svc_password => '#{password}',
3232
windows_feature_source => 'I:\\sources\\sxs',
33+
install_switches => {
34+
'UpdateEnabled' => 'false',
35+
}
3336
}
3437
MANIFEST
3538
idempotent_apply(pp)

spec/spec_helper_acceptance_local.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ def install_sqlserver(features)
148148
sa_pwd => 'Pupp3t1@',
149149
sql_sysadmin_accounts => ['#{USER}'],
150150
install_switches => {
151-
'UPDATEENABLED' => 'False',
151+
'UpdateEnabled' => 'false',
152152
'TCPENABLED' => 1,
153153
'SQLBACKUPDIR' => 'C:\\MSSQLSERVER\\backupdir',
154154
'SQLTEMPDBDIR' => 'C:\\MSSQLSERVER\\tempdbdir',

spec/sql_testing_helpers.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def install_sqlserver(host, opts = {})
3333
sa_pwd => 'Pupp3t1@',
3434
sql_sysadmin_accounts => ['#{user}'],
3535
install_switches => {
36-
'UPDATEENABLED' => 'False',
36+
'UpdateEnabled' => 'false',
3737
'TCPENABLED' => 1,
3838
'SQLBACKUPDIR' => 'C:\\MSSQLSERVER\\backupdir',
3939
'SQLTEMPDBDIR' => 'C:\\MSSQLSERVER\\tempdbdir',

spec/unit/puppet/provider/sqlserver_instance_spec.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ def stub_uninstall(args, installed_features, exit_code = 0)
5757
'/Q',
5858
'/IACCEPTSQLSERVERLICENSETERMS',
5959
"/INSTANCENAME=#{execute_args[:name]}",
60-
"/FEATURES=#{execute_args[:features].join(',')}",
61-
'/UPDATEENABLED=False']
60+
"/FEATURES=#{execute_args[:features].join(',')}"]
6261
(execute_args.keys - ['ensure', 'loglevel', 'features', 'name', 'source', 'sql_sysadmin_accounts', 'sql_security_mode', 'install_switches'].map(&:to_sym)).sort.map do |key|
6362
cmd_args << "/#{resourcekey_to_cmdarg[key.to_s]}=\"#{@resource[key]}\""
6463
end
@@ -96,7 +95,6 @@ def stub_uninstall(args, installed_features, exit_code = 0)
9695
'/ACTION=install',
9796
'/Q',
9897
'/IACCEPTSQLSERVERLICENSETERMS',
99-
'/UPDATEENABLED=False',
10098
"/INSTANCENAME=#{execute_args[:name]}",
10199
"/FEATURES=#{execute_args[:features].join(',')}"]
102100
(execute_args.keys - ['ensure', 'loglevel', 'features', 'name', 'source', 'sql_sysadmin_accounts', 'sql_security_mode', 'install_switches'].map(&:to_sym)).sort.map do |key|

spec/unit/puppet/sqlserver_spec_helper.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ def stub_modify_features(action, args, features, additional_switches = [], exit_
2323
'/Q',
2424
'/IACCEPTSQLSERVERLICENSETERMS',
2525
"/FEATURES=#{features.join(',')}"]
26-
cmds << '/UPDATEENABLED=False' if action == 'install'
2726
cmds << "/ISSVCACCOUNT=#{args[:is_svc_account]}" if args.key?(:is_svc_account)
2827
cmds << "/ISSVCPASSWORD=#{args[:is_svc_password]}" if args.key?(:is_svc_password)
2928
additional_switches.each do |switch|

0 commit comments

Comments
 (0)