Skip to content

Commit 562977a

Browse files
committed
Merge pull request redhat-openstack#299 from psoloway/readme
Update README per cd03959
2 parents 6aebeea + 2d64759 commit 562977a

1 file changed

Lines changed: 12 additions & 7 deletions

File tree

README.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ The concat module lets you gather `concat::fragment` resources from your other m
2727

2828
###What concat affects
2929

30-
The concat module requires the [file_concat module](https://forge.puppetlabs.com/ispavailability/file_concat). If you don't have file_concat installed, concat installs it for you.
30+
The concat module requires the [file_concat module](https://forge.puppetlabs.com/electrical/file_concat). If you don't have file_concat installed, concat installs it for you.
3131

3232
###Beginning with concat
3333

@@ -140,6 +140,10 @@ Specifies whether (and how) to back up the destination file before overwriting i
140140

141141
Specifies whether the destination file should exist. Setting to 'absent' tells Puppet to delete the destination file if it exists, and negates the effect of any other parameters. Valid options: 'present' and 'absent'. Default value: 'present'.
142142

143+
#####`force`
144+
145+
Deprecated as of concat v2.0.0. Has no effect.
146+
143147
#####`group`
144148

145149
Specifies a permissions group for the destination file. Valid options: a string containing a group name. Default value: undefined.
@@ -170,11 +174,11 @@ Specifies whether to overwrite the destination file if it already exists. Valid
170174

171175
Specifies a validation command to apply to the destination file. Requires Puppet version 3.5 or newer. Valid options: a string to be passed to a file resource. Default value: undefined.
172176

173-
#####`warn_header`
177+
#####`warn`
174178

175-
Specifies whether to add a header message at the top of the destination file so users know it was autogenerated by Puppet. In earlier versions of the concat module, this parameter was called `warn`. Valid options: the booleans 'true' and 'false', or a string to serve as the header. Default value: 'false'.
179+
Specifies whether to add a header message at the top of the destination file. Valid options: the booleans 'true' and 'false', or a string to serve as the header. Default value: 'false'.
176180

177-
If you set 'warn_header' to 'true', `concat` adds the following message:
181+
If you set 'warn' to 'true', `concat` adds the following message:
178182

179183
~~~
180184
# This file is managed by Puppet. DO NOT EDIT.
@@ -188,6 +192,10 @@ Except where noted, all the below parameters are optional.
188192

189193
Supplies the content of the fragment. **Note**: You must supply either a `content` parameter or a `source` parameter. Valid options: a string. Default value: undef.
190194

195+
#####`ensure`
196+
197+
Deprecated as of concat v2.0.0. Has no effect.
198+
191199
#####`order`
192200

193201
Reorders your fragments within the destination file. Fragments that share the same order number are ordered by name. Valid options: a string (recommended) or an integer. Default value: '10'.
@@ -206,11 +214,8 @@ The following functionality existed in previous versions of the concat module, b
206214

207215
Parameters removed from `concat`:
208216
* `ensure_newline`
209-
* `force`
210-
* `warn` (replaced by `warn_header`)
211217

212218
Parameters removed from `concat::fragment`:
213-
* `ensure`
214219
* `gnu`
215220
* `backup`
216221
* `group`

0 commit comments

Comments
 (0)