Skip to content

(Bug) - Remove default switch of UpdateEnabled=false when Action=Install #466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 21, 2023
Merged

(Bug) - Remove default switch of UpdateEnabled=false when Action=Install #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion lib/puppet/provider/sqlserver_features/mssql.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ def modify_features(action, features)
'/IACCEPTSQLSERVERLICENSETERMS',
"/FEATURES=#{features.join(',')}"]
if action == 'install'
cmd_args << '/UPDATEENABLED=False'
cmd_args << "/ISSVCACCOUNT=#{@resource[:is_svc_account]}" if not_nil_and_not_empty?(@resource[:is_svc_account])
cmd_args << "/ISSVCPASSWORD=#{@resource[:is_svc_password]}" if not_nil_and_not_empty?(@resource[:is_svc_password])
cmd_args << "/PID=#{@resource[:pid]}" if not_nil_and_not_empty?(@resource[:pid])
Expand Down
1 change: 0 additions & 1 deletion lib/puppet/provider/sqlserver_instance/mssql.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ def basic_cmd_args(features, action)
'/IACCEPTSQLSERVERLICENSETERMS',
"/INSTANCENAME=#{@resource[:name]}"]
cmd_args << "/FEATURES=#{features.join(',')}" unless features.empty?
cmd_args << '/UPDATEENABLED=False' if action == 'install'
cmd_args
end

Expand Down
1 change: 1 addition & 0 deletions spec/acceptance/sqlserver_config_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ def ensure_sqlserver_instance(inst_name, ensure_val = 'present')
sa_pwd => 'Pupp3t1@',
windows_feature_source => 'I:\\sources\\sxs',
install_switches => {
'UpdateEnabled' => 'false',
'SkipInstallerRunCheck' => 'True',
},
}
Expand Down
3 changes: 3 additions & 0 deletions spec/acceptance/sqlserver_instance_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ def ensure_sqlserver_instance(features, inst_name, ensure_val = 'present', sysad
agt_svc_account => '#{user}',
agt_svc_password => '#{password}',
windows_feature_source => 'I:\\sources\\sxs',
install_switches => {
'UpdateEnabled' => 'false',
},
}
MANIFEST
idempotent_apply(pp)
Expand Down
3 changes: 3 additions & 0 deletions spec/acceptance/z_last_sqlserver_features_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ def ensure_sql_features(features, ensure_val = 'present')
is_svc_password => '#{password}',
features => #{features},
windows_feature_source => 'I:\\sources\\sxs',
install_switches => {
'UpdateEnabled' => 'false',
}
}
MANIFEST

Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper_acceptance_local.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def install_sqlserver(features)
sa_pwd => 'Pupp3t1@',
sql_sysadmin_accounts => ['#{USER}'],
install_switches => {
'UPDATEENABLED' => 'False',
'UpdateEnabled' => 'false',
'TCPENABLED' => 1,
'SQLBACKUPDIR' => 'C:\\MSSQLSERVER\\backupdir',
'SQLTEMPDBDIR' => 'C:\\MSSQLSERVER\\tempdbdir',
Expand Down
2 changes: 1 addition & 1 deletion spec/sql_testing_helpers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def install_sqlserver(host, opts = {})
sa_pwd => 'Pupp3t1@',
sql_sysadmin_accounts => ['#{user}'],
install_switches => {
'UPDATEENABLED' => 'False',
'UpdateEnabled' => 'false',
'TCPENABLED' => 1,
'SQLBACKUPDIR' => 'C:\\MSSQLSERVER\\backupdir',
'SQLTEMPDBDIR' => 'C:\\MSSQLSERVER\\tempdbdir',
Expand Down
4 changes: 1 addition & 3 deletions spec/unit/puppet/provider/sqlserver_instance_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ def stub_uninstall(args, installed_features, exit_code = 0)
'/Q',
'/IACCEPTSQLSERVERLICENSETERMS',
"/INSTANCENAME=#{execute_args[:name]}",
"/FEATURES=#{execute_args[:features].join(',')}",
'/UPDATEENABLED=False']
"/FEATURES=#{execute_args[:features].join(',')}"]
(execute_args.keys - ['ensure', 'loglevel', 'features', 'name', 'source', 'sql_sysadmin_accounts', 'sql_security_mode', 'install_switches'].map(&:to_sym)).sort.map do |key|
cmd_args << "/#{resourcekey_to_cmdarg[key.to_s]}=\"#{@resource[key]}\""
end
Expand Down Expand Up @@ -96,7 +95,6 @@ def stub_uninstall(args, installed_features, exit_code = 0)
'/ACTION=install',
'/Q',
'/IACCEPTSQLSERVERLICENSETERMS',
'/UPDATEENABLED=False',
"/INSTANCENAME=#{execute_args[:name]}",
"/FEATURES=#{execute_args[:features].join(',')}"]
(execute_args.keys - ['ensure', 'loglevel', 'features', 'name', 'source', 'sql_sysadmin_accounts', 'sql_security_mode', 'install_switches'].map(&:to_sym)).sort.map do |key|
Expand Down
1 change: 0 additions & 1 deletion spec/unit/puppet/sqlserver_spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ def stub_modify_features(action, args, features, additional_switches = [], exit_
'/Q',
'/IACCEPTSQLSERVERLICENSETERMS',
"/FEATURES=#{features.join(',')}"]
cmds << '/UPDATEENABLED=False' if action == 'install'
cmds << "/ISSVCACCOUNT=#{args[:is_svc_account]}" if args.key?(:is_svc_account)
cmds << "/ISSVCPASSWORD=#{args[:is_svc_password]}" if args.key?(:is_svc_password)
additional_switches.each do |switch|
Expand Down