Skip to content

Commit 07c5518

Browse files
committed
(maint) Fix puppetdb package names on FreeBSD
FreeBSD ships with all current versions of puppet and make packages available with the major version as part of the package name, e.g. puppet6, puppetserver7, puppetdb6, puppetdb-terminus7. Gather the major frem thu user specified version if available, or default to the latest version if not specified to build actual package names.
1 parent 89ff12f commit 07c5518

File tree

1 file changed

+18
-3
lines changed

1 file changed

+18
-3
lines changed

manifests/params.pp

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@
3131
$postgres_version = '9.6'
3232
}
3333

34+
$puppetdb_major_version = $puppetdb_version ? {
35+
'latest' => '7',
36+
'present' => '7',
37+
default => $puppetdb_version.split('.')[0],
38+
}
39+
3440
# The remaining database settings are not used for an embedded database
3541
$database_host = 'localhost'
3642
$database_port = '5432'
@@ -81,27 +87,32 @@
8187
$java_args = {}
8288
$merge_default_java_args = true
8389

84-
$puppetdb_package = 'puppetdb'
8590
$puppetdb_service = 'puppetdb'
8691
$masterless = false
8792

8893
if !($puppetdb_version in ['latest','present','absent']) and versioncmp($puppetdb_version, '3.0.0') < 0 {
8994
case $::osfamily {
9095
'RedHat', 'Suse', 'Archlinux','Debian': {
96+
$puppetdb_package = 'puppetdb'
97+
$terminus_package = 'puppetdb-terminus'
9198
$etcdir = '/etc/puppetdb'
9299
$vardir = '/var/lib/puppetdb'
93100
$database_embedded_path = "${vardir}/db/db"
94101
$puppet_confdir = pick($settings::confdir,'/etc/puppet')
95102
$puppet_service_name = 'puppetmaster'
96103
}
97104
'OpenBSD': {
105+
$puppetdb_package = 'puppetdb'
106+
$terminus_package = 'puppetdb-terminus'
98107
$etcdir = '/etc/puppetdb'
99108
$vardir = '/var/db/puppetdb'
100109
$database_embedded_path = "${vardir}/db/db"
101110
$puppet_confdir = pick($settings::confdir,'/etc/puppet')
102111
$puppet_service_name = 'puppetmasterd'
103112
}
104113
'FreeBSD': {
114+
$puppetdb_package = inline_epp('puppetdb<%= $puppetdb::params::puppetdb_major_version %>')
115+
$terminus_package = inline_epp('puppetdb-terminus<%= $puppetdb::params::puppetdb_major_version %>')
105116
$etcdir = '/usr/local/etc/puppetdb'
106117
$vardir = '/var/db/puppetdb'
107118
$database_embedded_path = "${vardir}/db/db"
@@ -112,23 +123,28 @@
112123
fail("The fact 'osfamily' is set to ${::osfamily} which is not supported by the puppetdb module.")
113124
}
114125
}
115-
$terminus_package = 'puppetdb-terminus'
116126
$test_url = '/v3/version'
117127
} else {
118128
case $::osfamily {
119129
'RedHat', 'Suse', 'Archlinux','Debian': {
130+
$puppetdb_package = 'puppetdb'
131+
$terminus_package = 'puppetdb-termini'
120132
$etcdir = '/etc/puppetlabs/puppetdb'
121133
$puppet_confdir = pick($settings::confdir,'/etc/puppetlabs/puppet')
122134
$puppet_service_name = 'puppetserver'
123135
$vardir = '/opt/puppetlabs/server/data/puppetdb'
124136
}
125137
'OpenBSD': {
138+
$puppetdb_package = 'puppetdb'
139+
$terminus_package = 'puppetdb-termini'
126140
$etcdir = '/etc/puppetlabs/puppetdb'
127141
$puppet_confdir = pick($settings::confdir,'/etc/puppetlabs/puppet')
128142
$puppet_service_name = undef
129143
$vardir = '/opt/puppetlabs/server/data/puppetdb'
130144
}
131145
'FreeBSD': {
146+
$puppetdb_package = inline_epp('puppetdb<%= $puppetdb::params::puppetdb_major_version %>')
147+
$terminus_package = inline_epp('puppetdb-terminus<%= $puppetdb::params::puppetdb_major_version %>')
132148
$etcdir = '/usr/local/etc/puppetdb'
133149
$puppet_confdir = pick($settings::confdir,'/usr/local/etc/puppet')
134150
$puppet_service_name = 'puppetserver'
@@ -138,7 +154,6 @@
138154
fail("The fact 'osfamily' is set to ${::osfamily} which is not supported by the puppetdb module.")
139155
}
140156
}
141-
$terminus_package = 'puppetdb-termini'
142157
$test_url = '/pdb/meta/v1/version'
143158
$database_embedded_path = "${vardir}/db/db"
144159
}

0 commit comments

Comments
 (0)