From a7e0b385dccb4e7f3d954cfb7d80a94805492e5b Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Fri, 19 Aug 2011 11:03:02 +0300
Subject: [PATCH] Made puppet agent ignore site manifest

Fixes warnings about storeconfigs on master.
---
 puppet/templates/puppet.conf.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/puppet/templates/puppet.conf.erb b/puppet/templates/puppet.conf.erb
index b7d688c..d214146 100644
--- a/puppet/templates/puppet.conf.erb
+++ b/puppet/templates/puppet.conf.erb
@@ -41,6 +41,10 @@
 
 <% if puppetversion[/\d+/].to_i >= 2 -%>
 [agent]
+    # Ignore site manifest when run as agent. Fixes warnings about
+    # storeconfigs on master.
+    manifest = /dev/null
+
 <% else -%>
 [puppetd]
 <% end -%>