opendev/system-config
Code Issues Proposed changes

Merge "Conditionally manage puppetdb connection"

Browse Source
This commit is contained in:
Jenkins 2014-09-03 21:17:28 +00:00 committed by Gerrit Code Review
commit 9a37c9f967
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/openstack_project/manifests/puppetmaster.pp
View File

@ -6,6 +6,7 @@ class openstack_project::puppetmaster (
$sysadmins = [],
$version = '2.7.',
$ca_server = undef,
$puppetdb = true,
) {
include ansible
include logrotate
@ -105,11 +106,13 @@ class openstack_project::puppetmaster (
# Enable puppetdb
class { 'puppetdb::master::config':
puppetdb_server => 'puppetdb.openstack.org',
puppet_service_name => 'apache2',
puppetdb_soft_write_failure => true,
manage_storeconfigs => false,
if $puppetdb {
class { 'puppetdb::master::config':
puppetdb_server => 'puppetdb.openstack.org',
puppet_service_name => 'apache2',
puppetdb_soft_write_failure => true,
manage_storeconfigs => false,
}
}
# Playbooks