From fa38169bdd7af51af5381c466c45d7032ce55900 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 25 Apr 2014 13:51:35 -0700 Subject: [PATCH] Make puppet not fail when puppetdb is dead By default puppet will fail to run if the puppetdb is not available. This introduces some chicken and egg problems associated with getting things working again if you expect puppet to do that for you. Mark puppetdb write failures as soft failures instead allowing puppet to run even when puppetdb is not up. See http://docs.puppetlabs.com/puppetdb/1.6/connect_puppet_master.html#edit-puppetdbconf for more info. Note you cannot use storeconfigs with this option set so store_configs options are removed from the puppet master config. Change-Id: I8c2023eac11fecaa3815741450f176ad16ede729 --- modules/openstack_project/manifests/puppetmaster.pp | 1 + modules/openstack_project/templates/puppet.conf.erb | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp index 641cbdff24..9588c709a7 100644 --- a/modules/openstack_project/manifests/puppetmaster.pp +++ b/modules/openstack_project/manifests/puppetmaster.pp @@ -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, } } diff --git a/modules/openstack_project/templates/puppet.conf.erb b/modules/openstack_project/templates/puppet.conf.erb index 52cb6df626..51ee09500d 100644 --- a/modules/openstack_project/templates/puppet.conf.erb +++ b/modules/openstack_project/templates/puppet.conf.erb @@ -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