Skip to content

Commit 7ac589d

Browse files
committed
Make sure puppetdb.conf contains correct entries depending on the terminus version
1 parent d3b1d16 commit 7ac589d

File tree

1 file changed

+22
-12
lines changed

1 file changed

+22
-12
lines changed

manifests/master/puppetdb_conf.pp

+22-12
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,29 @@
2121
}
2222

2323
if $legacy_terminus {
24-
ini_setting { 'puppetdbserver':
25-
setting => 'server',
26-
value => $server,
27-
}
28-
ini_setting { 'puppetdbport':
29-
setting => 'port',
30-
value => $port,
31-
}
24+
$legacy_ensure = 'present'
25+
$newterminus_ensure = 'absent'
3226
} else {
33-
ini_setting { 'puppetdbserver_urls':
34-
setting => 'server_urls',
35-
value => "https://${server}:${port}/",
36-
}
27+
$legacy_ensure = 'absent'
28+
$newterminus_ensure = 'present'
29+
}
30+
31+
ini_setting { 'puppetdbserver':
32+
ensure => $legacy_ensure,
33+
setting => 'server',
34+
value => $server,
35+
}
36+
37+
ini_setting { 'puppetdbport':
38+
ensure => $legacy_ensure,
39+
setting => 'port',
40+
value => $port,
41+
}
42+
43+
ini_setting { 'puppetdbserver_urls':
44+
ensure => $newterminus_ensure,
45+
setting => 'server_urls',
46+
value => "https://${server}:${port}/",
3747
}
3848

3949
ini_setting { 'soft_write_failure':

0 commit comments

Comments
 (0)