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, 18 insertions, 17 deletions

diff --git a/src/lib/Bcfg2/Server/BuiltinCore.py b/src/lib/Bcfg2/Server/BuiltinCore.py
index ea1d97e83..179a6aa9f 100644
--- a/src/lib/Bcfg2/Server/BuiltinCore.py
+++ b/src/lib/Bcfg2/Server/BuiltinCore.py
@@ -4,8 +4,9 @@ import sys
 import time
 import socket
 import daemon
+import Bcfg2.Options
 import Bcfg2.Server.Statistics
-from Bcfg2.Server.Core import BaseCore, NoExposedMethod
+from Bcfg2.Server.Core import NetworkCore, NoExposedMethod
 from Bcfg2.Compat import xmlrpclib, urlparse
 from Bcfg2.Server.SSLServer import XMLRPCServer
 
@@ -18,29 +19,29 @@ except ImportError:
 # pylint: enable=E0611
 
 
-class Core(BaseCore):
+class BuiltinCore(NetworkCore):
     """ The built-in server core """
     name = 'bcfg2-server'
 
     def __init__(self):
-        BaseCore.__init__(self)
+        NetworkCore.__init__(self)
 
         #: The :class:`Bcfg2.Server.SSLServer.XMLRPCServer` instance
         #: powering this server core
         self.server = None
 
-        daemon_args = dict(uid=self.setup['daemon_uid'],
-                           gid=self.setup['daemon_gid'],
-                           umask=int(self.setup['umask'], 8),
+        daemon_args = dict(uid=Bcfg2.Options.setup.daemon_uid,
+                           gid=Bcfg2.Options.setup.daemon_gid,
+                           umask=int(Bcfg2.Options.setup.umask, 8),
                            detach_process=True)
-        if self.setup['daemon']:
-            daemon_args['pidfile'] = TimeoutPIDLockFile(self.setup['daemon'],
-                                                        acquire_timeout=5)
+        if Bcfg2.Options.setup.daemon:
+            daemon_args['pidfile'] = TimeoutPIDLockFile(
+                Bcfg2.Options.setup.daemon, acquire_timeout=5)
         #: The :class:`daemon.DaemonContext` used to drop
         #: privileges, write the PID file (with :class:`PidFile`),
         #: and daemonize this core.
         self.context = daemon.DaemonContext(**daemon_args)
-    __init__.__doc__ = BaseCore.__init__.__doc__.split('.. -----')[0]
+    __init__.__doc__ = NetworkCore.__init__.__doc__.split('.. -----')[0]
 
     def _dispatch(self, method, args, dispatch_dict):
         """ Dispatch XML-RPC method calls
@@ -95,25 +96,25 @@ class Core(BaseCore):
         except LockTimeout:
             err = sys.exc_info()[1]
             self.logger.error("Failed to daemonize %s: Failed to acquire lock "
-                              "on %s" % (self.name, self.setup['daemon']))
+                              "on %s" % (self.name,
+                                         Bcfg2.Options.setup.daemon))
             return False
 
     def _run(self):
         """ Create :attr:`server` to start the server listening. """
-        hostname, port = urlparse(self.setup['location'])[1].split(':')
+        hostname, port = urlparse(Bcfg2.Options.setup.server)[1].split(':')
         server_address = socket.getaddrinfo(hostname,
                                             port,
                                             socket.AF_UNSPEC,
                                             socket.SOCK_STREAM)[0][4]
         try:
-            self.server = XMLRPCServer(self.setup['listen_all'],
+            self.server = XMLRPCServer(Bcfg2.Options.setup.listen_all,
                                        server_address,
-                                       keyfile=self.setup['key'],
-                                       certfile=self.setup['cert'],
+                                       keyfile=Bcfg2.Options.setup.key,
+                                       certfile=Bcfg2.Options.setup.cert,
                                        register=False,
                                        timeout=1,
-                                       ca=self.setup['ca'],
-                                       protocol=self.setup['protocol'])
+                                       ca=Bcfg2.Options.setup.ca)
         except:  # pylint: disable=W0702
             err = sys.exc_info()[1]
             self.logger.error("Server startup failed: %s" % err)