Skip to content

Commit fe61f2f

Browse files
authored
Merge pull request #189 from gguillotte/docs-signoff-edits
(FM-5476) (docs) Edits for docs signoff
2 parents 8dc419a + bce7285 commit fe61f2f

File tree

2 files changed

+109
-99
lines changed

2 files changed

+109
-99
lines changed

CHANGELOG.md

+42-32
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,75 @@
11
## 2016-08-31 - Supported Release 1.1.4
2+
23
### Summary
34

4-
- Small release with several bug fixes and minor feature
5+
- Small release with several bug fixes and a minor feature.
56

67
#### Features
7-
- Added `windows_feature_source` to `sqlserver_instance` and `sqlserver_features` resources. This specifies the location of the Windows Feature source files. This may be needed to install the .Net Framework. See https://support.microsoft.com/en-us/kb/2734782 for more information. ([MODULES-3202](https://tickets.puppet.com/browse/MODULES-3202))
8+
9+
- Add `windows_feature_source` parameter to the `sqlserver_instance` and `sqlserver_features` resources. This specifies the location of the Windows Feature source files, which might be needed to install the .NET Framework. See https://support.microsoft.com/en-us/kb/2734782 for more information ([MODULES-3202](https://tickets.puppet.com/browse/MODULES-3202)).
810

911
#### Bug Fixes
10-
- Fix adding multiple SYSADMIN role accounts on instance creation ([MODULES-3427](https://tickets.puppet.com/browse/MODULES-3427))
11-
- Fix creation and deletion of Windows base logins ([MODULES-3256](https://tickets.puppet.com/browse/MODULES-3256))
12-
- Fix deleting logins ([MODULES-2323](https://tickets.puppet.com/browse/MODULES-2323))
13-
- Fix deleting databases ([MODULES-2554](https://tickets.puppet.com/browse/MODULES-2554))
14-
- Refactor acceptance tests for `sqlserver::login` resource ([MODULES-3256](https://tickets.puppet.com/browse/MODULES-3256))
15-
- Fix modifying server roles for an existing login ([MODULES-3083](https://tickets.puppet.com/browse/MODULES-3083))
16-
- Fix modifying server roles for an existing Windows user login ([MODULES-3752](https://tickets.puppet.com/browse/MODULES-3752))
12+
13+
- Fix issues when adding multiple SYSADMIN role accounts on instance creation ([MODULES-3427](https://tickets.puppet.com/browse/MODULES-3427)).
14+
- Fix issues when creating and deleting Windows base logins ([MODULES-3256](https://tickets.puppet.com/browse/MODULES-3256)).
15+
- Fix errors when deleting MS SQL Server logins ([MODULES-2323](https://tickets.puppet.com/browse/MODULES-2323)) and databases ([MODULES-2554](https://tickets.puppet.com/browse/MODULES-2554)).
16+
- Refactor acceptance tests for `sqlserver::login` resource ([MODULES-3256](https://tickets.puppet.com/browse/MODULES-3256)).
17+
- Fix issues when modifying server roles for an existing login ([MODULES-3083](https://tickets.puppet.com/browse/MODULES-3083)).
18+
- Fix issues when modifying an existing Windows user login ([MODULES-3752](https://tickets.puppet.com/browse/MODULES-3752)).
1719

1820
## 2016-07-12 - Supported Release 1.1.3
21+
1922
### Summary
2023

21-
- Small release with several bug fixes and minor features
22-
- Updated the supported Puppet version ranges
24+
- Small release with several bug fixes and minor features.
25+
- Update the supported Puppet version ranges.
2326

2427
#### Features
25-
- Updated documentation with more advanced SQL example
26-
- Add Windows Based Authentication for `sqlserver::config`. Modifies the `sqlserver::config` class with an additional property called `login_type` which can be either `SQL_LOGIN` or `WINDOWS_LOGIN`, with a default of `SQL_LOGIN`
28+
29+
- Update documentation with a more advanced SQL example.
30+
- Add Windows Based Authentication for `sqlserver::config`. Modifies the `sqlserver::config` class with an additional property called `login_type` which can be either `SQL_LOGIN` or `WINDOWS_LOGIN`, with a default of `SQL_LOGIN`.
2731

2832
#### Bug Fixes
29-
- Fix Role Name Collisions. This fix introduces the database name into the title created for the `sqlserver_tsql` statements so that it is unique
30-
- Minor refactoring of code which is not used or make code path more obvious
31-
- Fix TSQL error propagation. Introduce a minor refactor so that the `returns` property captures errors properly from TSQL executions
32-
- Emit debug output on failed `onlyif` TSQL. Previously, there was no way of getting the log output from SQL Server when executing TSQL during an `onlyif`
33+
34+
- Fix Role Name Collisions. This fix introduces the database name into the title created for the `sqlserver_tsql` statements so that it is unique.
35+
- Minor refactoring of code which is not used or makes code path more obvious.
36+
- Fix TSQL error propagation. Introduce a minor refactor so that the `returns` property captures errors properly from TSQL executions.
37+
- Emit debug output on failed `onlyif` TSQL. Previously, there was no way of getting the log output from SQL Server when executing TSQL during an `onlyif`.
3338

3439
## 2016-04-11 - Supported Release 1.1.2
35-
### Summary
3640

37-
Small release to support Puppet version ranges.
41+
### Summary
3842

43+
Small release to update supported Puppet version ranges.
3944

4045
## 2015-12-08 - Supported Release 1.1.1
46+
4147
### Summary
4248

43-
Small release for support of newer PE versions.
49+
Small release to support newer PE versions.
4450

4551
## 2015-09-08 - Supported Release 1.1.0
52+
4653
### Summary
4754

48-
User, Roles and Login as well as they permissions associated with each are now available.
55+
User, Roles, and Login, as well as the permissions associated with each, are now available.
4956

5057
#### Features
51-
- `sqlserver_instance` and `sqlserver_features` have new parameter `install_switches` which takes a hash of install switches and writes them to a temp configuration file for the the install process
52-
- Add define for permissions for Users, Roles and Logins
53-
- `sqlserver::config` no longer writes a file to the sytem
54-
- New `sqlserver_tsql` provider available to execute custom scripts
55-
- Remove dependency on 'sqlcmd.exe'
56-
- Performance discovery improvements
57-
- Remove dependency for ACL modules
58+
59+
- `sqlserver_instance` and `sqlserver_features` have new parameter `install_switches`, which takes a hash of install switches and writes them to a temporary configuration file for the install process.
60+
- Add define for permissions for Users, Roles, and Logins.
61+
- `sqlserver::config` no longer writes a file to the sytem.
62+
- New `sqlserver_tsql` provider available to execute custom scripts.
63+
- Remove dependency on 'sqlcmd.exe'.
64+
- Performance discovery improvements.
65+
- Remove dependency for ACL modules.
5866

5967
#### Bug Fixes
60-
- Munge values for instance names to always be uppercase when comparing
61-
- Change the way we look up logins to use sys.server_principals instead of function that might not report correctly
62-
- Fix issue with collation_name and databases where the variable was not named properly causing it to never be set
68+
69+
- Munge values for instance names to always be uppercase when comparing.
70+
- Change the way we look up logins to use sys.server_principals instead of a function that might not report correctly.
71+
- Fix issue with `collation_name` and databases where the variable was not named properly, causing it to never be set.
6372

6473
## 2014-12-08 - 1.0.0
65-
Initial release
74+
75+
Initial release.

README.md

+67-67
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# sqlserver
22

3-
####Table of Contents
3+
#### Table of contents
44

55
1. [Overview](#overview)
66
2. [Module Description - What the module does and why it is useful](#module-description)
@@ -18,34 +18,34 @@
1818
6. [Limitations - OS compatibility, etc.](#limitations)
1919
7. [Development - Guide for contributing to the module](#development)
2020

21-
##Overview
21+
## Overview
2222

2323
The sqlserver module installs and manages Microsoft SQL Server 2012 and 2014 on Windows systems.
2424

25-
##Module Description
25+
## Module description
2626

2727
Microsoft SQL Server is a database platform for Windows. The sqlserver module lets you use Puppet to install multiple instances of SQL Server, add SQL features and client tools, execute TSQL statements, and manage databases, users, roles, and server configuration options.
2828

29-
##Setup
29+
## Setup
3030

31-
###Setup Requirements
31+
### Setup requirements
3232

3333
The sqlserver module requires the following:
3434

3535
* Puppet Enterprise 3.7 or later.
36-
* .NET 3.5 (installed automatically if not present. This might require an internet connection).
36+
* .NET 3.5. (Installed automatically if not present. This might require an internet connection.)
3737
* The contents of the SQL Server ISO file, mounted or extracted either locally or on a network share.
38-
* Windows Server 2012 or 2012R2.
38+
* Windows Server 2012 or 2012 R2.
3939

40-
###Beginning with sqlserver
40+
### Beginning with sqlserver
4141

4242
To get started with the sqlserver module, include these settings in your manifest:
4343

4444
~~~puppet
45-
sqlserver_instance{'MSSQLSERVER':
46-
features => ['SQL'],
47-
source => 'E:/',
48-
sql_sysadmin_accounts => ['myuser'],
45+
sqlserver_instance{ 'MSSQLSERVER':
46+
features => ['SQL'],
47+
source => 'E:/',
48+
sql_sysadmin_accounts => ['myuser'],
4949
}
5050
~~~
5151

@@ -54,7 +54,7 @@ This example installs MS SQL and creates an MS SQL instance named MSSQLSERVER. I
5454
A more advanced configuration, including installer switches:
5555

5656
~~~puppet
57-
sqlserver_instance{'MSSQLSERVER':
57+
sqlserver_instance{ 'MSSQLSERVER':
5858
source => 'E:/',
5959
features => ['SQL'],
6060
security_mode => 'SQL',
@@ -74,11 +74,11 @@ sqlserver_instance{'MSSQLSERVER':
7474

7575
This example creates the same MS SQL instance as shown above with additional options: security mode (requiring password to be set) and other optional install switches. This is specified using a hash syntax.
7676

77-
##Usage
77+
## Usage
7878

7979
Note: For clarification on Microsoft SQL Server terminology, please see [Microsoft SQL Server Terms](#microsoft-sql-server-terms) below.
8080

81-
###Install SQL Server tools and features not specific to a SQL Server instance
81+
### Install SQL Server tools and features not specific to a SQL Server instance
8282

8383
~~~puppet
8484
sqlserver_features { 'Generic Features':
@@ -89,98 +89,98 @@ sqlserver_features { 'Generic Features':
8989

9090
~~~puppet
9191
sqlserver_features { 'Generic Features':
92-
source => 'E:/',
93-
features => ['ADV_SSMS', 'BC', 'Conn', 'SDK', 'SSMS'],
92+
source => 'E:/',
93+
features => ['ADV_SSMS', 'BC', 'Conn', 'SDK', 'SSMS'],
9494
}
9595
~~~
9696

97-
###Create a new database on an instance of SQL Server
97+
### Create a new database on an instance of SQL Server
9898

9999
~~~puppet
100100
sqlserver::database{ 'minviable':
101-
instance => 'MSSQLSERVER',
101+
instance => 'MSSQLSERVER',
102102
}
103103
~~~
104104

105-
###Set up a new login
105+
### Set up a new login
106106

107107
~~~puppet
108-
SQL Login
109-
sqlserver::login{'vagrant':
108+
# SQL Login
109+
sqlserver::login{ 'vagrant':
110110
instance => 'MSSQLSERVER',
111111
password => 'Pupp3t1@',
112112
}
113113
114-
Windows Login
115-
sqlserver::login{'WIN-D95P1A3V103\localAccount':
114+
# Windows Login
115+
sqlserver::login{ 'WIN-D95P1A3V103\localAccount':
116116
instance => 'MSSQLSERVER',
117117
login_type => 'WINDOWS_LOGIN',
118118
}
119119
~~~
120120

121-
###Create a new login and a user for a given database
121+
### Create a new login and a user for a given database
122122

123123
~~~puppet
124-
sqlserver::login{'loggingUser':
125-
password => 'Pupp3t1@',
124+
sqlserver::login{ 'loggingUser':
125+
password => 'Pupp3t1@',
126126
}
127127
128-
sqlserver::user{'rp_logging-loggingUser':
129-
user => 'loggingUser',
130-
database => 'rp_logging',
131-
require => Sqlserver::Login['loggingUser'],
128+
sqlserver::user{ 'rp_logging-loggingUser':
129+
user => 'loggingUser',
130+
database => 'rp_logging',
131+
require => Sqlserver::Login['loggingUser'],
132132
}
133133
~~~
134134

135-
###Manage the above user's permissions
135+
### Manage the above user's permissions
136136

137137
~~~puppet
138-
sqlserver::user::permissions{'INSERT-loggingUser-On-rp_logging':
139-
user => 'loggingUser',
140-
database => 'rp_logging',
141-
permissions => 'INSERT',
142-
require => Sqlserver::User['rp_logging-loggingUser'],
138+
sqlserver::user::permissions{ 'INSERT-loggingUser-On-rp_logging':
139+
user => 'loggingUser',
140+
database => 'rp_logging',
141+
permissions => 'INSERT',
142+
require => Sqlserver::User['rp_logging-loggingUser'],
143143
}
144144
145-
sqlserver::user::permissions{'Deny the Update as we should only insert':
146-
user => 'loggingUser',
147-
database => 'rp_logging',
148-
permissions => 'UPDATE',
149-
state => 'DENY',
150-
require => Sqlserver::User['rp_logging-loggingUser'],
145+
sqlserver::user::permissions{ 'Deny the Update as we should only insert':
146+
user => 'loggingUser',
147+
database => 'rp_logging',
148+
permissions => 'UPDATE',
149+
state => 'DENY',
150+
require => Sqlserver::User['rp_logging-loggingUser'],
151151
}
152152
~~~
153153

154-
###Run custom TSQL statements
154+
### Run custom TSQL statements
155155

156-
####Use `sqlserver_tsql` to trigger other classes or defines
156+
#### Use `sqlserver_tsql` to trigger other classes or defines
157157

158158
~~~puppet
159159
sqlserver_tsql{ 'Query Logging DB Status':
160-
instance => 'MSSQLSERVER',
161-
onlyif => "IF (SELECT count(*) FROM myDb.dbo.logging_table WHERE
162-
message like 'FATAL%') > 1000 THROW 50000, 'Fatal Exceptions in Logging', 10",
163-
notify => Exec['Too Many Fatal Errors']
160+
instance => 'MSSQLSERVER',
161+
onlyif => "IF (SELECT count(*) FROM myDb.dbo.logging_table WHERE
162+
message like 'FATAL%') > 1000 THROW 50000, 'Fatal Exceptions in Logging', 10",
163+
notify => Exec['Too Many Fatal Errors']
164164
}
165165
~~~
166166

167-
####Clean up regular logs with conditional checks
167+
#### Clean up regular logs with conditional checks
168168

169169
~~~puppet
170170
sqlserver_tsql{ 'Cleanup Old Logs':
171-
instance => 'MSSQLSERVER',
172-
command => "DELETE FROM myDb.dbo.logging_table WHERE log_date < '${log_max_date}'",
173-
onlyif => "IF exists(SELECT * FROM myDb.dbo.logging_table WHERE log_date < '${log_max_date}')
174-
THROW 50000, 'need log cleanup', 10",
171+
instance => 'MSSQLSERVER',
172+
command => "DELETE FROM myDb.dbo.logging_table WHERE log_date < '${log_max_date}'",
173+
onlyif => "IF exists(SELECT * FROM myDb.dbo.logging_table WHERE log_date < '${log_max_date}')
174+
THROW 50000, 'need log cleanup', 10",
175175
}
176176
~~~
177177

178-
####If you want your statement to always execute, leave out the `onlyif` parameter
178+
#### Always execute a statement by omitting the `onlyif` parameter
179179

180180
~~~puppet
181181
sqlserver_tsql{ 'Always running':
182-
instance => 'MSSQLSERVER',
183-
command => 'EXEC notified_executor()',
182+
instance => 'MSSQLSERVER',
183+
command => 'EXEC notified_executor()',
184184
}
185185
~~~
186186

@@ -206,7 +206,7 @@ Installs and configures features such as SSMS and Master Data Service.
206206

207207
* `source`: *Required.* Locates the SQL Server installer. Valid options: a string containing the path to an executable. Puppet must have permission to execute the installer.
208208

209-
* `windows_feature_source`: *Optional.* Specifies the location of the Windows Feature source files. This may be needed to install the .Net Framework. See https://support.microsoft.com/en-us/kb/2734782 for more information.
209+
* `windows_feature_source`: *Optional.* Specifies the location of the Windows Feature source files, which might be needed to install the .NET Framework. See https://support.microsoft.com/en-us/kb/2734782 for more information.
210210

211211
Please note that if an option is set in both its own specific parameter and `install_switches`, the specifically named parameter takes precedence. For example, if you set the product key in both `pid` and in `install_switches`, SQL Server honors the `pid` parameter.
212212

@@ -263,7 +263,7 @@ Installs and configures a SQL Server instance.
263263

264264
* `sql_sysadmin_accounts`: *Required.* Specifies one or more SQL or system accounts to receive sysadmin status. Valid options: an array containing one or more valid usernames.
265265

266-
* `windows_feature_source`: *Optional.* Specifies the location of the Windows Feature source files. This may be needed to install the .Net Framework. See https://support.microsoft.com/en-us/kb/2734782 for more information.
266+
* `windows_feature_source`: *Optional.* Specifies the location of the Windows Feature source files, which might be needed to install the .NET Framework. See https://support.microsoft.com/en-us/kb/2734782 for more information.
267267

268268
Please note that if an option is set in both its own specific parameter and `install_switches`, the specifically named parameter takes precedence. For example, if you set the product key in both `pid` and in `install_switches`, SQL Server honors the `pid` parameter.
269269

@@ -272,7 +272,7 @@ For more information about installer switches and configuring SQL Server, see th
272272
* [Installer Switches](https://msdn.microsoft.com/en-us/library/ms144259.aspx)
273273
* [Configuration File](https://msdn.microsoft.com/en-us/library/dd239405.aspx)
274274

275-
####`sqlserver_tsql`
275+
#### `sqlserver_tsql`
276276

277277
Executes a TSQL query against a SQL Server instance.
278278

@@ -292,7 +292,7 @@ Requires the `sqlserver::config` define for access to the parent instance.
292292

293293
Stores credentials for Puppet to use when managing a given SQL Server instance.
294294

295-
* `admin_login_type`: *Optional.* Specifies the type of login used to manage to SQL Server instace. The login type affects the `admin_user` and admin_pass` parameters which are described below. Valid options: 'SQL_LOGIN' and 'WINDOWS_LOGIN'. Default: 'SQL_LOGIN'.
295+
* `admin_login_type`: *Optional.* Specifies the type of login used to manage to SQL Server instance. The login type affects the `admin_user` and `admin_pass` parameters which are described below. Valid options: 'SQL_LOGIN' and 'WINDOWS_LOGIN'. Default: 'SQL_LOGIN'.
296296

297297
- When using SQL Server based authentication - `SQL_LOGIN`
298298

@@ -302,9 +302,9 @@ Stores credentials for Puppet to use when managing a given SQL Server instance.
302302

303303
- When using Windows based authentication - `WINDOWS_LOGIN`
304304

305-
* `admin_pass`: *Optional.* Valid options: undefined or an empty string `''`
305+
* `admin_pass`: *Optional.* Valid options: undefined or an empty string (`''`).
306306

307-
* `admin_user`: *Optional.* Valid options: undefined or an empty string `''`
307+
* `admin_user`: *Optional.* Valid options: undefined or an empty string (`''`).
308308

309309
* `instance_name`: *Optional.* Specifies a SQL Server instance to manage. Valid options: a string containing the name of an existing instance. Default: the title of your declared resource.
310310

@@ -549,14 +549,14 @@ Terminology differs somewhat between various database systems; please refer to t
549549
* **Role:** a database-level or server-level permissions group.
550550
* **User:** a database-level account, typically mapped to a login.
551551

552-
##Limitations
552+
## Limitations
553553

554-
This module is available only for Windows Server 2012 or 2012R2, and works with Puppet Enterprise 3.7 and later.
554+
This module is available only for Windows Server 2012 or 2012 R2, and works with Puppet Enterprise 3.7 and later.
555555

556556
## Development
557557

558-
This module was built by Puppet Inc specifically for use with Puppet Enterprise (PE).
558+
This module was built by Puppet Inc. specifically for use with Puppet Enterprise (PE).
559559

560560
If you run into an issue with this module, or if you would like to request a feature, please [file a ticket](https://tickets.puppet.com/browse/MODULES/).
561561

562-
If you are having problems getting this module up and running, please [contact Support](http://puppet.com/services/customer-support).
562+
If you have problems getting this module up and running, please [contact Support](https://puppet.com/support-services/customer-support).

0 commit comments

Comments
 (0)