Skip to content

Commit 1387f21

Browse files
committed
add missing parameter documentation to master::config class
1 parent 93d2637 commit 1387f21

File tree

2 files changed

+16
-13
lines changed

2 files changed

+16
-13
lines changed

REFERENCE.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1184,8 +1184,8 @@ The following parameters are available in the `puppetdb::master::config` class:
11841184
* [`terminus_package`](#-puppetdb--master--config--terminus_package)
11851185
* [`puppet_service_name`](#-puppetdb--master--config--puppet_service_name)
11861186
* [`puppetdb_startup_timeout`](#-puppetdb--master--config--puppetdb_startup_timeout)
1187-
* [`restart_puppet`](#-puppetdb--master--config--restart_puppet)
11881187
* [`test_url`](#-puppetdb--master--config--test_url)
1188+
* [`restart_puppet`](#-puppetdb--master--config--restart_puppet)
11891189

11901190
##### <a name="-puppetdb--master--config--puppetdb_server"></a>`puppetdb_server`
11911191

@@ -1321,15 +1321,15 @@ Default value: `true`
13211321

13221322
Data type: `Any`
13231323

1324-
Puppet's config directory. Defaults to `/etc/puppet`.
1324+
Puppet's config directory. Defaults to `/etc/puppetlabs/puppet`.
13251325

13261326
Default value: `$puppetdb::params::puppet_confdir`
13271327

13281328
##### <a name="-puppetdb--master--config--puppet_conf"></a>`puppet_conf`
13291329

13301330
Data type: `Any`
13311331

1332-
Puppet's config file. Defaults to `/etc/puppet/puppet.conf`.
1332+
Puppet's config file. Defaults to `${puppet_confdir}/puppet.conf`.
13331333

13341334
Default value: `$puppetdb::params::puppet_conf`
13351335

@@ -1372,6 +1372,14 @@ seconds).
13721372

13731373
Default value: `$puppetdb::params::puppetdb_startup_timeout`
13741374

1375+
##### <a name="-puppetdb--master--config--test_url"></a>`test_url`
1376+
1377+
Data type: `Any`
1378+
1379+
The URL to use for testing if the PuppetDB instance is running.
1380+
1381+
Default value: `$puppetdb::params::test_url`
1382+
13751383
##### <a name="-puppetdb--master--config--restart_puppet"></a>`restart_puppet`
13761384

13771385
Data type: `Any`
@@ -1383,14 +1391,6 @@ files (other than `puppet.conf`).
13831391

13841392
Default value: `true`
13851393

1386-
##### <a name="-puppetdb--master--config--test_url"></a>`test_url`
1387-
1388-
Data type: `Any`
1389-
1390-
1391-
1392-
Default value: `$puppetdb::params::test_url`
1393-
13941394
### <a name="puppetdb--server"></a>`puppetdb::server`
13951395

13961396
manage the PuppetDB server

manifests/master/config.pp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
# or disabled (`false`) in the puppet.conf file.
5757
#
5858
# @param puppet_confdir
59-
# Puppet's config directory. Defaults to `/etc/puppet`.
59+
# Puppet's config directory. Defaults to `/etc/puppetlabs/puppet`.
6060
#
6161
# @param puppet_conf
62-
# Puppet's config file. Defaults to `/etc/puppet/puppet.conf`.
62+
# Puppet's config file. Defaults to `${puppet_confdir}/puppet.conf`.
6363
#
6464
# @param masterless
6565
# A boolean switch to enable or disable the masterless setup of PuppetDB. Defaults
@@ -80,6 +80,9 @@
8080
# This is most important during the initial install of PuppetDB (defaults to 15
8181
# seconds).
8282
#
83+
# @param test_url
84+
# The URL to use for testing if the PuppetDB instance is running.
85+
#
8386
# @param restart_puppet
8487
# If `true`, the module will restart the Puppet master when PuppetDB configuration
8588
# files are changed by the module. Defaults to `true`. If set to `false`, you

0 commit comments

Comments
 (0)