diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2009-05-15 03:57:33 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2009-05-15 03:57:33 +0000 |
| commit | e226690c555e87ac13f5d2543d197864e4d0270c (patch) | |
| tree | 18f2215e2206fb7afe986f8b7660cb0e2c997ada /src/sbin/bcfg2-server | |
| parent | 60a2643d4e7bd0a0964180ebbfd8e31d12cbbf98 (diff) | |
| download | bcfg2-e226690c555e87ac13f5d2543d197864e4d0270c.tar.gz bcfg2-e226690c555e87ac13f5d2543d197864e4d0270c.tar.bz2 bcfg2-e226690c555e87ac13f5d2543d197864e4d0270c.zip | |
Merge xmlrpc interfaces with Bcfg2.Server.Core
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5238 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin/bcfg2-server')
| -rwxr-xr-x | src/sbin/bcfg2-server | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server index 78b1ece80..1c9eab9ef 100755 --- a/src/sbin/bcfg2-server +++ b/src/sbin/bcfg2-server @@ -12,7 +12,6 @@ import Bcfg2.Options import Bcfg2.Component import Bcfg2.Server.Plugins.Metadata from Bcfg2.Server.Core import CoreInitError -import Bcfg2.Server.XMLRPC logger = logging.getLogger('bcfg2-server') @@ -29,7 +28,7 @@ if __name__ == '__main__': OPTINFO.update({'repo': Bcfg2.Options.SERVER_REPOSITORY, 'plugins': Bcfg2.Options.SERVER_PLUGINS, 'password': Bcfg2.Options.SERVER_PASSWORD, - 'filemonitor': Bcfg2.Options.SERVER_FILEMONITOR, + 'fm': Bcfg2.Options.SERVER_FILEMONITOR, }) OPTINFO.update({'key' : Bcfg2.Options.SERVER_KEY, 'cert' : Bcfg2.Options.SERVER_CERT, @@ -46,11 +45,18 @@ if __name__ == '__main__': setup.parse(sys.argv[1:]) print setup try: - Bcfg2.Component.run_component(Bcfg2.Server.XMLRPC.bcfg2_server, + Bcfg2.Component.run_component(Bcfg2.Server.Core.Core, location=setup['location'], daemon = setup['daemon'], pidfile_name = setup['daemon'], - register=False, cls_kwargs={'setup':setup}, + register=False, + cls_kwargs={'repo':setup['repo'], + 'plugins':setup['plugins'], + 'password':setup['password'], + 'encoding':setup['encoding'], + 'ca':setup['ca'], + 'filemonitor':setup['fm'], + 'start_fam_thread':True}, keyfile=setup['key'], certfile=setup['cert'], ca=setup['ca'], |