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

diff --git a/src/lib/Bcfg2/Options/Common.py b/src/lib/Bcfg2/Options/Common.py
new file mode 100644
index 000000000..302be61f4
--- /dev/null
+++ b/src/lib/Bcfg2/Options/Common.py
@@ -0,0 +1,135 @@
+""" Common options used in multiple different contexts. """
+
+import Types
+from Actions import PluginsAction, ComponentAction
+from Parser import repository as _repository_option
+from Options import Option, PathOption, BooleanOption
+
+__all__ = ["Common"]
+
+
+class classproperty(object):
+    """ Decorator that can be used to create read-only class
+    properties. """
+
+    def __init__(self, getter):
+        self.getter = getter
+
+    def __get__(self, instance, owner):
+        return self.getter(owner)
+
+
+class ReportingTransportAction(ComponentAction):
+    """ :class:`Bcfg2.Options.ComponentAction` that loads a single
+    reporting transport from :mod:`Bcfg2.Reporting.Transport`. """
+    islist = False
+    bases = ['Bcfg2.Reporting.Transport']
+
+
+class ReportingStorageAction(ComponentAction):
+    """ :class:`Bcfg2.Options.ComponentAction` that loads a single
+    reporting storage driver from :mod:`Bcfg2.Reporting.Storage`. """
+    islist = False
+    bases = ['Bcfg2.Reporting.Storage']
+
+
+class Common(object):
+    """ Common options used in multiple different contexts. """
+    _plugins = None
+    _filemonitor = None
+    _reporting_storage = None
+    _reporting_transport = None
+
+    @classproperty
+    def plugins(cls):
+        """ Load a list of Bcfg2 server plugins """
+        if cls._plugins is None:
+            cls._plugins = Option(
+                cf=('server', 'plugins'),
+                type=Types.comma_list, help="Server plugin list",
+                action=PluginsAction,
+                default=['Bundler', 'Cfg', 'Metadata', 'Pkgmgr', 'Rules',
+                         'SSHbase'])
+        return cls._plugins
+
+    @classproperty
+    def filemonitor(cls):
+        """ Load a single Bcfg2 file monitor (from
+        :attr:`Bcfg2.Server.FileMonitor.available`) """
+        if cls._filemonitor is None:
+            import Bcfg2.Server.FileMonitor
+
+            class FileMonitorAction(ComponentAction):
+                islist = False
+                mapping = Bcfg2.Server.FileMonitor.available
+
+            cls._filemonitor = Option(
+                cf=('server', 'filemonitor'), action=FileMonitorAction,
+                default='default', help='Server file monitoring driver')
+        return cls._filemonitor
+
+    @classproperty
+    def reporting_storage(cls):
+        """ Load a Reporting storage backend """
+        if cls._reporting_storage is None:
+            cls._reporting_storage = Option(
+                cf=('reporting', 'storage'), dest="reporting_storage",
+                help='Reporting storage engine',
+                action=ReportingStorageAction, default='DjangoORM')
+        return cls._reporting_storage
+
+    @classproperty
+    def reporting_transport(cls):
+        """ Load a Reporting transport backend """
+        if cls._reporting_transport is None:
+            cls._reporting_transport = Option(
+                cf=('reporting', 'transport'), dest="reporting_transport",
+                help='Reporting transport',
+                action=ReportingTransportAction, default='DirectStore')
+        return cls._reporting_transport
+
+    #: Set the path to the Bcfg2 repository
+    repository = _repository_option
+
+    #: Daemonize process, storing PID
+    daemon = PathOption(
+        '-D', '--daemon', help="Daemonize process, storing PID")
+
+    #: Run interactively, prompting the user for each change
+    interactive = BooleanOption(
+        "-I", "--interactive",
+        help='Run interactively, prompting the user for each change')
+
+    #: Log to syslog
+    syslog = BooleanOption(
+        cf=('logging', 'syslog'), help="Log to syslog")
+
+    #: Server location
+    location = Option(
+        '-S', '--server', cf=('components', 'bcfg2'),
+        default='https://localhost:6789', metavar='<https://server:port>',
+        help="Server location")
+
+    #: Communication password
+    password = Option(
+        '-x', '--password', cf=('communication', 'password'),
+        metavar='<password>', help="Communication Password")
+
+    #: Path to SSL key
+    ssl_key = PathOption(
+        '--ssl-key', cf=('communication', 'key'), dest="key",
+        help='Path to SSL key', default="/etc/pki/tls/private/bcfg2.key")
+
+    #: Path to SSL certificate
+    ssl_cert = PathOption(
+        cf=('communication', 'certificate'), dest="cert",
+        help='Path to SSL certificate', default="/etc/pki/tls/certs/bcfg2.crt")
+
+    #: Path to SSL CA certificate
+    ssl_ca = PathOption(
+        cf=('communication', 'ca'), help='Path to SSL CA Cert')
+
+    #: Default Path paranoid setting
+    default_paranoid = Option(
+        cf=('mdata', 'paranoid'), dest="default_paranoid", default='true',
+        choices=['true', 'false'], help='Default Path paranoid setting')