Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370612 )
Change subject: puppet-compiler use the correct CA for puppetdb
......................................................................
puppet-compiler use the correct CA for puppetdb
Change-Id: Ie66fb4b0a4159b256a950aa562aefc945e34d86f
---
M modules/puppet_compiler/manifests/init.pp
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/puppet_compiler/manifests/init.pp
b/modules/puppet_compiler/manifests/init.pp
index de5f30f..f719a8b 100644
--- a/modules/puppet_compiler/manifests/init.pp
+++ b/modules/puppet_compiler/manifests/init.pp
@@ -111,6 +111,7 @@
# Add a puppetdb instance with a local database.
class { 'puppetdb::app':
db_driver => 'hsqldb',
+ ca_path => '/etc/puppetdb/ssl/ca.pem',
heap_size => '2G',
db_rw_host => undef,
perform_gc => true,
@@ -119,6 +120,12 @@
require => Exec['Generate CA for the compiler']
}
+ file { '/etc/puppetdb/ssl/ca.pem':
+ source => "${libdir}/production/ssl/certs/ca.pem",
+ owner => $user,
+ before => Service['puppetdb']
+ }
+
class { 'puppetmaster::puppetdb::client':
host => $::fqdn,
port => 8081,
--
To view, visit https://gerrit.wikimedia.org/r/370612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie66fb4b0a4159b256a950aa562aefc945e34d86f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
