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