Skip to content

Commit de0091a

Browse files
techsk8bastelfreak
authored andcommitted
add posibility to manage terminus package
1 parent b207a35 commit de0091a

File tree

2 files changed

+25
-9
lines changed

2 files changed

+25
-9
lines changed

README.md

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,8 @@ Then the `foreman_ssl_{ca,cert,key}` parameters are ignored and `certs::puppet`
5656

5757
## PuppetDB integration
5858

59-
The Puppet server can be configured to export catalogs and reports to a
60-
PuppetDB instance, using the puppetlabs/puppetdb module. Use its
61-
`puppetdb::server` class to install the PuppetDB server and this module to
62-
configure the Puppet server to connect to PuppetDB.
59+
The Puppet server can be configured to export catalogs and reports to a PuppetDB instance, using the puppetlabs/puppetdb module.
60+
Use its `puppetdb::server` class to install the PuppetDB server and this module to configure the Puppet server to connect to PuppetDB.
6361

6462
Requires [puppetlabs/puppetdb](https://forge.puppetlabs.com/puppetlabs/puppetdb)
6563

@@ -74,8 +72,9 @@ class { 'puppet::server::puppetdb':
7472
}
7573
```
7674

77-
Above example manages Puppetserver + PuppetDB integration. It won't install the
78-
PuppetDB. To do so, you also need the `puppetdb` class
75+
Above example manages Puppetserver + PuppetDB integration.
76+
It won't install the PuppetDB.
77+
To do so, you also need the `puppetdb` class
7978

8079
```puppet
8180
class { 'puppet':
@@ -115,15 +114,26 @@ class { 'puppet::server::puppetdb':
115114
}
116115
```
117116

118-
Above code will install Puppetserver/PuppetDB/PostgreSQL on a single server. It
119-
will use the upstream postgresql repositories. It was tested on Ubuntu.
117+
Above code will install Puppetserver/PuppetDB/PostgreSQL on a single server.
118+
It will use the upstream postgresql repositories.
119+
It was tested on Ubuntu.
120120

121121
Please also make sure your puppetdb ciphers are compatible with your puppet server ciphers, ie that the two following parameters match:
122+
122123
```
123124
puppet::server::cipher_suites
124125
puppetdb::server::cipher_suites
125126
```
126127

128+
By default, the Perforce packages are used.
129+
To use the new [OpenVoxProject packages](https://voxpupuli.org/openvox/), update the package name:
130+
131+
```puppet
132+
class { 'puppet::server::puppetdb':
133+
terminus_package => 'openvoxdb-termini',
134+
}
135+
```
136+
127137
# Installation
128138

129139
Available from GitHub (via cloning or tarball), [Puppet Forge](https://forge.puppetlabs.com/theforeman/puppet)

manifests/server/puppetdb.pp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# Note that this doesn't manage the server itself.
77
#
8-
# @example
8+
# @example simple PuppetDB Setup
99
# class { 'puppet':
1010
# server => true,
1111
# server_reports => 'puppetdb,foreman',
@@ -23,17 +23,23 @@
2323
#
2424
# @param soft_write_failure
2525
# Whether to enable soft write failure
26+
#
27+
# @param terminus_package
28+
# The PuppetDB terminus package
29+
#
2630
class puppet::server::puppetdb (
2731
Stdlib::Host $server = undef,
2832
Stdlib::Port $port = 8081,
2933
Boolean $soft_write_failure = false,
34+
String[1] $terminus_package = 'puppetdb-termini',
3035
) {
3136
class { 'puppetdb::master::config':
3237
puppetdb_server => $server,
3338
puppetdb_port => $port,
3439
puppetdb_soft_write_failure => $soft_write_failure,
3540
manage_storeconfigs => false,
3641
restart_puppet => false,
42+
terminus_package => $terminus_package,
3743
}
3844
Class['puppetdb::master::puppetdb_conf'] ~> Class['puppet::server::service']
3945
}

0 commit comments

Comments
 (0)