Merge branch 'options-rewrite'

Conflicts:
	src/lib/Bcfg2/Client/Frame.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Admin/Init.py
	src/lib/Bcfg2/Server/Admin/Xcmd.py
	src/lib/Bcfg2/Server/BuiltinCore.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/MultiprocessingCore.py
	src/lib/Bcfg2/Server/Plugin/base.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
	src/lib/Bcfg2/Server/SSLServer.py
	src/lib/Bcfg2/Utils.py
	src/lib/Bcfg2/settings.py
	src/sbin/bcfg2-crypt
	src/sbin/bcfg2-info
	src/sbin/bcfg2-lint
	src/sbin/bcfg2-test
	src/sbin/bcfg2-yum-helper
	tools/bcfg2-profile-templates.py

1 files changed, 12 insertions, 9 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Properties.py b/src/lib/Bcfg2/Server/Plugins/Properties.py
index 8e54da19b..bbc00556b 100644
--- a/src/lib/Bcfg2/Server/Plugins/Properties.py
+++ b/src/lib/Bcfg2/Server/Plugins/Properties.py
@@ -7,7 +7,7 @@ import sys
 import copy
 import logging
 import lxml.etree
-from Bcfg2.Options import get_option_parser
+import Bcfg2.Options
 import Bcfg2.Server.Plugin
 from Bcfg2.Server.Plugin import PluginExecutionError
 
@@ -40,18 +40,14 @@ class PropertyFile(object):
         .. automethod:: _write
         """
         self.name = name
-        self.setup = get_option_parser()
 
     def write(self):
         """ Write the data in this data structure back to the property
         file. This public method performs checking to ensure that
         writing is possible and then calls :func:`_write`. """
-        if not self.setup.cfp.getboolean("properties", "writes_enabled",
-                                         default=True):
-            msg = "Properties files write-back is disabled in the " + \
-                "configuration"
-            LOGGER.error(msg)
-            raise PluginExecutionError(msg)
+        if not Bcfg2.Options.setup.writes_enabled:
+            raise PluginExecutionError("Properties files write-back is "
+                                       "disabled in the configuration")
         try:
             self.validate_data()
         except PluginExecutionError:
@@ -199,7 +195,7 @@ class XMLPropertyFile(Bcfg2.Server.Plugin.StructFile, PropertyFile):
     validate_data.__doc__ = PropertyFile.validate_data.__doc__
 
     def get_additional_data(self, metadata):
-        if self.setup.cfp.getboolean("properties", "automatch", default=False):
+        if Bcfg2.Options.setup.automatch:
             default_automatch = "true"
         else:
             default_automatch = "false"
@@ -221,6 +217,13 @@ class Properties(Bcfg2.Server.Plugin.Plugin,
                  Bcfg2.Server.Plugin.DirectoryBacked):
     """ The properties plugin maps property files into client metadata
     instances. """
+    options = [
+        Bcfg2.Options.BooleanOption(
+            cf=("properties", "writes_enabled"), default=True,
+            help="Enable or disable Properties write-back"),
+        Bcfg2.Options.BooleanOption(
+            cf=("properties", "automatch"),
+            help="Enable Properties automatch")]
 
     #: Extensions that are understood by Properties.
     extensions = ["xml"]