Skip to content

Commit bfe3de4

Browse files
Merge pull request #68 from razorsedge/templatedir
templatedir is deprecated, so do not add by default.
2 parents 0c15ebc + 31579fd commit bfe3de4

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

README.markdown

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ Optionally, an `environmentpath` parameter can be supplied to configure the base
6060
splay => true,
6161
}
6262

63+
## Deprecation Warning ##
64+
65+
The `templatedir` parameter will default to `undef` and will remove the setting from the puppet.conf file in version 2.0.0 of this module.
66+
6367
## Testing ##
6468

6569
Install gems:

manifests/agent.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
$use_srv_records = false,
5858
$srv_domain = undef,
5959
$ordering = undef,
60-
$templatedir = '$confdir/templates',
60+
$templatedir = undef,
6161
$trusted_node_data = undef,
6262
$listen = false,
6363
$reportserver = '$server',

spec/classes/puppet_agent_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,7 @@
465465
:puppet_run_interval => 30,
466466
:puppet_server_port => 8140,
467467
:use_srv_records => false,
468+
:templatedir => '$confdir/templates'
468469
}
469470
end
470471

@@ -491,8 +492,7 @@
491492
:environment => 'production',
492493
:puppet_run_interval => 30,
493494
:puppet_server_port => 8140,
494-
:use_srv_records => false,
495-
:templatedir => 'undef'
495+
:use_srv_records => false
496496
}
497497
end
498498

0 commit comments

Comments
 (0)