diff --git a/CHANGELOG.md b/CHANGELOG.md index ca01729..20141ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change log information for Veeam Cookbook +## Version 4.1.0 +2020-09-02 + +- UPDATE: SQL instance names are now flexible trough an attribute. + ## Version 4.0.3 2020-08-14 diff --git a/attributes/server.rb b/attributes/server.rb index e0b9053..4f0efcf 100644 --- a/attributes/server.rb +++ b/attributes/server.rb @@ -14,12 +14,11 @@ default['veeam']['server']['vbr_service_port'] = nil default['veeam']['server']['vbr_secure_connections_port'] = nil # SQL Server Connection Details -default['veeam']['server']['vbr_sqlserver_server'] = nil +default['veeam']['server']['vbr_sqlserver_server'] = ".\\VeeamSQL2016" default['veeam']['server']['vbr_sqlserver_database'] = nil default['veeam']['server']['vbr_sqlserver_auth'] = nil default['veeam']['server']['vbr_sqlserver_username'] = nil default['veeam']['server']['vbr_sqlserver_password'] = nil - default['veeam']['server']['pf_ad_nfsdatastore'] = nil default['veeam']['server']['keep_media'] = false diff --git a/metadata.rb b/metadata.rb index 3499ffe..0417878 100644 --- a/metadata.rb +++ b/metadata.rb @@ -3,7 +3,7 @@ maintainer_email 'chef@exospheredata.com' license 'Apache-2.0' description 'Installs/Configures Veeam Backup and Recovery' -version '4.0.3' +version '4.1.0' chef_version '>= 13.0' supports 'windows' diff --git a/recipes/server.rb b/recipes/server.rb index d5c1a91..44995f4 100644 --- a/recipes/server.rb +++ b/recipes/server.rb @@ -30,6 +30,7 @@ accept_eula node['veeam']['server']['accept_eula'] evaluation node['veeam']['server']['evaluation'] install_dir node['veeam']['server']['install_dir'] + vbr_sqlserver_server node['veeam']['server']['vbr_sqlserver_server'] vbr_service_user node['veeam']['server']['vbr_service_user'] vbr_service_password node['veeam']['server']['vbr_service_password'] vbr_service_port node['veeam']['server']['vbr_service_port'] diff --git a/recipes/server_with_catalog.rb b/recipes/server_with_catalog.rb index 6c11a26..be2c638 100644 --- a/recipes/server_with_catalog.rb +++ b/recipes/server_with_catalog.rb @@ -30,6 +30,7 @@ accept_eula node['veeam']['server']['accept_eula'] evaluation node['veeam']['server']['evaluation'] install_dir node['veeam']['server']['install_dir'] + vbr_sqlserver_server node['veeam']['server']['vbr_sqlserver_server'] vbr_service_user node['veeam']['server']['vbr_service_user'] vbr_service_password node['veeam']['server']['vbr_service_password'] vbr_service_port node['veeam']['server']['vbr_service_port'] diff --git a/recipes/server_with_console.rb b/recipes/server_with_console.rb index a999740..ba84909 100644 --- a/recipes/server_with_console.rb +++ b/recipes/server_with_console.rb @@ -30,6 +30,7 @@ accept_eula node['veeam']['server']['accept_eula'] evaluation node['veeam']['server']['evaluation'] install_dir node['veeam']['server']['install_dir'] + vbr_sqlserver_server node['veeam']['server']['vbr_sqlserver_server'] vbr_service_user node['veeam']['server']['vbr_service_user'] vbr_service_password node['veeam']['server']['vbr_service_password'] vbr_service_port node['veeam']['server']['vbr_service_port'] diff --git a/recipes/standalone_complete.rb b/recipes/standalone_complete.rb index 8800502..173b37b 100644 --- a/recipes/standalone_complete.rb +++ b/recipes/standalone_complete.rb @@ -30,6 +30,7 @@ accept_eula node['veeam']['server']['accept_eula'] evaluation node['veeam']['server']['evaluation'] install_dir node['veeam']['server']['install_dir'] + vbr_sqlserver_server node['veeam']['server']['vbr_sqlserver_server'] vbr_service_user node['veeam']['server']['vbr_service_user'] vbr_service_password node['veeam']['server']['vbr_service_password'] vbr_service_port node['veeam']['server']['vbr_service_port'] diff --git a/resources/prerequisites.rb b/resources/prerequisites.rb index dc5f11f..0e2b52b 100644 --- a/resources/prerequisites.rb +++ b/resources/prerequisites.rb @@ -178,6 +178,7 @@ def install_sql_express(downloaded_file_name) source ::File.join('sql_server', 'ConfigurationFile.ini.erb') provider Chef::Provider::File::Template variables( + sqlInstanceName: node['veeam']['server']['vbr_sqlserver_server'].split('\\')[-1], sqlSysAdminList: sql_sys_admin_list ) end diff --git a/templates/sql_server/ConfigurationFile.ini.erb b/templates/sql_server/ConfigurationFile.ini.erb index d9d4e66..ede5010 100644 --- a/templates/sql_server/ConfigurationFile.ini.erb +++ b/templates/sql_server/ConfigurationFile.ini.erb @@ -80,7 +80,7 @@ SQMREPORTING="False" ; Specify a default or named instance. MSSQLSERVER is the default instance for non-Express editions and SQLExpress for Express editions. This parameter is required when installing the SQL Server Database Engine (SQL), Analysis Services (AS), or Reporting Services (RS). -INSTANCENAME="VeeamSQL2012" +INSTANCENAME="<%= @sqlInstanceName %>" ; Agent account name