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, 29 insertions, 0 deletions

diff --git a/src/lib/Bcfg2/Server/Plugin/__init__.py b/src/lib/Bcfg2/Server/Plugin/__init__.py
index ed1282ba0..a85867134 100644
--- a/src/lib/Bcfg2/Server/Plugin/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugin/__init__.py
@@ -14,6 +14,7 @@ documentation it's not necessary to use the submodules.  E.g., you can
 
 import os
 import sys
+import Bcfg2.Options
 sys.path.append(os.path.dirname(__file__))
 
 # pylint: disable=W0401
@@ -21,3 +22,31 @@ from Bcfg2.Server.Plugin.base import *
 from Bcfg2.Server.Plugin.interfaces import *
 from Bcfg2.Server.Plugin.helpers import *
 from Bcfg2.Server.Plugin.exceptions import *
+
+
+class _OptionContainer(object):
+    options = [
+        Bcfg2.Options.Common.default_paranoid,
+        Bcfg2.Options.Option(
+            cf=('mdata', 'owner'), dest="default_owner", default='root',
+            help='Default Path owner'),
+        Bcfg2.Options.Option(
+            cf=('mdata', 'group'), dest="default_group", default='root',
+            help='Default Path group'),
+        Bcfg2.Options.Option(
+            cf=('mdata', 'important'), dest="default_important",
+            default='false', choices=['true', 'false'],
+            help='Default Path priority (importance)'),
+        Bcfg2.Options.Option(
+            cf=('mdata', 'mode'), dest="default_mode", default='644',
+            help='Default mode for Path'),
+        Bcfg2.Options.Option(
+            cf=('mdata', 'secontext'), dest="default_secontext",
+            default='__default__', help='Default SELinux context'),
+        Bcfg2.Options.Option(
+            cf=('mdata', 'sensitive'), dest="default_sensitive",
+            default='false',
+            help='Default Path sensitivity setting')]
+
+
+Bcfg2.Options.get_parser().add_component(_OptionContainer)