Merge branch 'maint'

Conflicts:
	doc/server/plugins/generators/cfg.txt
	doc/server/plugins/generators/tcheetah.txt
	src/lib/Bcfg2/Server/Admin/Xcmd.py
	src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py

2 files changed, 9 insertions, 1 deletions

diff --git a/src/lib/Bcfg2/Server/Plugin/base.py b/src/lib/Bcfg2/Server/Plugin/base.py
index ecd970b54..c825a57b5 100644
--- a/src/lib/Bcfg2/Server/Plugin/base.py
+++ b/src/lib/Bcfg2/Server/Plugin/base.py
@@ -87,6 +87,10 @@ class Plugin(Debuggable):
     #: alphabetically by their name.
     sort_order = 500
 
+    #: Whether or not to automatically create a data directory for
+    #: this plugin
+    create = True
+
     #: List of names of methods to be exposed as XML-RPC functions
     __rmi__ = Debuggable.__rmi__
 
@@ -107,7 +111,7 @@ class Plugin(Debuggable):
         self.Entries = {}
         self.core = core
         self.data = os.path.join(datastore, self.name)
-        if not os.path.exists(self.data):
+        if self.create and not os.path.exists(self.data):
             self.logger.warning("%s: %s does not exist, creating" %
                                 (self.name, self.data))
             os.makedirs(self.data)
diff --git a/src/lib/Bcfg2/Server/Plugin/interfaces.py b/src/lib/Bcfg2/Server/Plugin/interfaces.py
index d460cc45d..7909eaa03 100644
--- a/src/lib/Bcfg2/Server/Plugin/interfaces.py
+++ b/src/lib/Bcfg2/Server/Plugin/interfaces.py
@@ -286,6 +286,8 @@ class Statistics(Plugin):
     you should avoid using Statistics and use
     :class:`ThreadedStatistics` instead."""
 
+    create = False
+
     def process_statistics(self, client, xdata):
         """ Process the given XML statistics data for the specified
         client.
@@ -526,6 +528,8 @@ class GoalValidator(object):
 class Version(Plugin):
     """ Version plugins interact with various version control systems. """
 
+    create = False
+
     #: The path to the VCS metadata file or directory, relative to the
     #: base of the Bcfg2 repository.  E.g., for Subversion this would
     #: be ".svn"