Skip to content

Commit be2fae8

Browse files
Merge pull request #443 from jpogran/doc-update-installDirectory-use
(doc) Update puppet.installDirectory usage
2 parents 3f1ad20 + 7fdd5f5 commit be2fae8

File tree

1 file changed

+45
-19
lines changed

1 file changed

+45
-19
lines changed

README.md

Lines changed: 45 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -275,15 +275,15 @@ You can also install the extension without access to the internet by following t
275275

276276
## Configuration
277277

278-
The Puppet VSCode extension can use the PDK or the Puppet Agent to provide advanced features, which can be set using two configuration options: `puppet.installType` and `puppet.puppetAgentDir`.
278+
The Puppet VSCode extension can use the PDK or the Puppet Agent to provide advanced features, which can be set using two configuration options: `puppet.installType` and `puppet.installDirectory`.
279279

280280
- By default the `puppet.installType` is set to `agent`, and allows you to choose to use `pdk` or `agent`.
281-
- The `puppet.puppetAgentDir` allows you to choose a custom path to either a PDK install or a Puppet-Agent install, and must match the correct setting in `puppet.installType`.
281+
- The `puppet.installDirectory` allows you to choose a custom path to either a PDK install or a Puppet-Agent install, and must match the correct setting in `puppet.installType`.
282282

283283
If no settings are chosen, the extension will attempt to use the Puppet Agent, to force it to use the PDK you have to select `pdk` for `puppet.installType`.
284284

285285

286-
> Note: The `puppet.puppetAgentDir` setting name will be changed in the `0.12.0` release to `puppet.installDirectory`
286+
> Note: The `puppet.installDirectory` setting name will be changed in the `0.12.0` release to `puppet.installDirectory`
287287
288288
> Note: Only PDK v1.5.0 and above are supported.
289289
@@ -299,22 +299,35 @@ To ensure that the extension uses the PDK, set the `puppet.installType` setting
299299

300300
The default installation paths stored in the extension are:
301301

302+
Windows:
303+
304+
```json
305+
{
306+
"puppet.installDirectory":"C:\\Program Files\\Puppet Labs\\DevelopmentKit"
307+
}
308+
```
309+
310+
OSX:
311+
312+
```json
313+
{
314+
"puppet.installDirectory":"/opt/puppetlabs/pdk"
315+
}
316+
```
317+
318+
Linux:
319+
302320
```json
303321
{
304-
// Windows
305-
"puppet.puppetAgentDir":"C:\\Program Files\\Puppet Labs\\DevelopmentKit",
306-
// Mac
307-
"puppet.puppetAgentDir":"/opt/puppetlabs/pdk",
308-
// Linux
309-
"puppet.puppetAgentDir":"/opt/puppetlabs/pdk"
322+
"puppet.installDirectory":"/opt/puppetlabs/pdk"
310323
}
311324
```
312325

313-
To use a custom install path for the PDK, set the `puppet.puppetAgentDir` setting to the path you installed the PDK to:
326+
To use a custom install path for the PDK, set the `puppet.installDirectory` setting to the path you installed the PDK to:
314327

315328
```json
316329
{
317-
"puppet.puppetAgentDir":"D:/programs/pdk"
330+
"puppet.installDirectory":"D:/programs/pdk"
318331
}
319332
```
320333

@@ -330,22 +343,35 @@ To ensure that the extension uses the Puppet-Agent, set the `puppet.installType`
330343

331344
The default installation paths stored in the extension are:
332345

346+
Windows:
347+
348+
```json
349+
{
350+
"puppet.installDirectory":"C:\\Program Files\\Puppet Labs\\Puppet",
351+
}
352+
```
353+
354+
OSX
355+
356+
```json
357+
{
358+
"puppet.installDirectory":"/opt/puppetlabs"
359+
}
360+
```
361+
362+
Linux:
363+
333364
```json
334365
{
335-
// Windows
336-
"puppet.puppetAgentDir":"C:\\Program Files\\Puppet Labs\\Puppet",
337-
// Mac
338-
"puppet.puppetAgentDir":"/opt/puppetlabs",
339-
//Linux
340-
"puppet.puppetAgentDir":"/opt/puppetlabs"
366+
"puppet.installDirectory":"/opt/puppetlabs"
341367
}
342368
```
343369

344-
To use a custom install path for the Puppet-Agent, set the `puppet.puppetAgentDir` setting to the path you installed the Puppet-Agent to:
370+
To use a custom install path for the Puppet-Agent, set the `puppet.installDirectory` setting to the path you installed the Puppet-Agent to:
345371

346372
```json
347373
{
348-
"puppet.puppetAgentDir":"D:/programs/puppet"
374+
"puppet.installDirectory":"D:/programs/puppet"
349375
}
350376
```
351377

0 commit comments

Comments
 (0)