(MODULES-4257) Modify instance and features for SQL Server 2016#215
Merged
hunner merged 5 commits intopuppetlabs:masterfrom Jun 8, 2017
glennsarti:modules-4257-modify-instance-and-features
Merged
(MODULES-4257) Modify instance and features for SQL Server 2016#215hunner merged 5 commits intopuppetlabs:masterfrom glennsarti:modules-4257-modify-instance-and-features
hunner merged 5 commits intopuppetlabs:masterfrom
glennsarti:modules-4257-modify-instance-and-features
Conversation
Previously the custom facts for the module only supported SQL Server 2012 and 2014. This commit updates the facts to support usage on SQL Server 2016, and adds additional feature detection for features that have been added in Server 2016, or missed out on Server 2014.
This commit deletes code which has been commented out for some time and serves no purpose.
Previously the sqlserver_instance and sqlserver_feature acceptance tests were failing. This was mainly due to SQL Server 2016 not having a feature for the SQL Management Studio (ADV_SSMS and SSMS). However it was later found that the super features called Tools and SQL were not providing an adequate abstraction e.g. they were not rolled up in the Facter facts. This commit adds support for SQL Server 2016 by the following: - Deprecating the use of 'Tools' in the sqlserver_features and 'SQL' in the sqlserver_instance custom types. These super features will continue to function however use of them will generate a deprecation warning - The acceptance tests for the super features was removed - Most tests which referred to ADV_SSMS and SSMS were removed. Where not possible, they were guarded to not be tested on SQL Server 2016. - An installation media version detection method was added as Dot Net 3.5 is not required for SQL Server 2016 installation. This is only applicable for SQL Server 2012 and 2014. - Refactored the instances method for sqlserver_features to support multiple server editions on a server but until MODULES-5060 is resolved, only the first set is returned.
This commit removes the double underscore type error in the file names for the puppet provider tests.
Contributor
Author
|
Builds on #212 |
Contributor
Author
|
Adhoc successfully passed for SQL Server 2012, 2014 and 2016 |
hunner
reviewed
Jun 8, 2017
| instance_version = PuppetX::Sqlserver::ServerHelper.sql_version_from_install_source(@resource[:source]) | ||
| Puppet.debug("Installation source detected as version #{instance_version}") unless instance_version.nil? | ||
|
|
||
| installNet35(@resource[:windows_feature_source]) unless instance_version == SQL_2016 |
Contributor
There was a problem hiding this comment.
This will trigger when instance_version is nil
| instance_version = PuppetX::Sqlserver::ServerHelper.sql_version_from_install_source(@resource[:source]) | ||
| Puppet.debug("Installation source detected as version #{instance_version}") unless instance_version.nil? | ||
|
|
||
| installNet35(@resource[:windows_feature_source]) unless instance_version == SQL_2016 |
Contributor
There was a problem hiding this comment.
This will trigger when instance_version is nil
Contributor
Author
There was a problem hiding this comment.
This would mirror the current default action of always installing dotNet3.5. I cannot see any harm in installing dot net if the installation media version cannot be detected.
This commit updates the README with new features available for SQL Server 2016, and adds notes about the deprecation of the super features.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Previously the sqlserver_instance and sqlserver_feature acceptance tests were
failing. This was mainly due to SQL Server 2016 not having a feature for the
SQL Management Studio (ADV_SSMS and SSMS). However it was later found that the
super features called Tools and SQL were not providing an adequate abstraction
e.g. they were not rolled up in the Facter facts. This commit adds support for
SQL Server 2016 by the following:
sqlserver_instance custom types. These super features will continue to
function however use of them will generate a deprecation warning
possible, they were guarded to not be tested on SQL Server 2016.
not required for SQL Server 2016 installation. This is only applicable for
SQL Server 2012 and 2014.
server editions on a server but until MODULES-5060 is resolved, only the first
set is returned.