summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo Hörnquist <hugo@lysator.liu.se>2022-01-15 09:55:20 +0100
committerHugo Hörnquist <hugo@lysator.liu.se>2022-01-15 09:55:20 +0100
commit9af2b6a441eae1e33af67275d157a7a04767cf43 (patch)
tree2a194efcc871484f7896cc1105e66e1584e8f19d
parentMove storeconfigs_backend configuration. (diff)
downloadprofiles-9af2b6a441eae1e33af67275d157a7a04767cf43.tar.gz
profiles-9af2b6a441eae1e33af67275d157a7a04767cf43.tar.xz
Change puppetdb::master::config setup.
-rw-r--r--manifests/puppetdb.pp5
-rw-r--r--manifests/puppetserver.pp5
2 files changed, 5 insertions, 5 deletions
diff --git a/manifests/puppetdb.pp b/manifests/puppetdb.pp
index 2eaf01a..1ee62c5 100644
--- a/manifests/puppetdb.pp
+++ b/manifests/puppetdb.pp
@@ -7,4 +7,9 @@ class profiles::puppetdb {
listen_address => '::',
disable_ssl => false,
}
+
+ # This is "requried", and is recommended to be included in this way
+ # (presumably to later allow setting parameters)
+ class { 'puppetdb::master::config':
+ }
}
diff --git a/manifests/puppetserver.pp b/manifests/puppetserver.pp
index 6baed36..80cf8f9 100644
--- a/manifests/puppetserver.pp
+++ b/manifests/puppetserver.pp
@@ -2,7 +2,6 @@ class profiles::puppetserver (
# TODO provide sensible default here, to allow us to bootstrap
# ourselves
Hash $hiera,
- String $puppetdb_server = $::fqdn,
) {
# required for the git hook
ensure_packages(['ruby'])
@@ -54,10 +53,6 @@ class profiles::puppetserver (
}
}
- class { 'puppetdb::master::config':
- puppetdb_server => $puppetdb_server,
- }
-
# TODO
# apt install puppetdb-termini