opendev/system-config
Code Issues Proposed changes

Merge "Make puppet not fail when puppetdb is dead"

Browse Source
This commit is contained in:
Jenkins 2014-04-25 21:12:31 +00:00 committed by Gerrit Code Review
commit dbe60b3d7f
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,6 +104,7 @@ class openstack_project::puppetmaster (
class { 'puppetdb::master::config':
puppetdb_server => 'puppetdb.openstack.org',
puppet_service_name => 'apache2',
soft_write_failure => true,
}
}

2
modules/openstack_project/templates/puppet.conf.erb
View File

@ -18,8 +18,6 @@ manifestdir=/opt/config/$environment/manifests
modulepath=/opt/config/$environment/modules:/etc/puppet/modules
manifest=$manifestdir/site.pp
reports=store,puppetdb
storeconfigs = true
storeconfigs_backend = puppetdb
[agent]
report=true