diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2008-01-09 21:21:18 +0000 |
---|---|---|
committer | Narayan Desai <desai@mcs.anl.gov> | 2008-01-09 21:21:18 +0000 |
commit | 2848627d82951554359ca9d7e23fa0326c21f2e1 (patch) | |
tree | f5ec15464a97d2b3c4b96a6843a5c0e7bc3c3272 /src/sbin | |
parent | 3dca8f84e8f9bd024f64ce8ed3caf61dfeccb915 (diff) | |
download | bcfg2-2848627d82951554359ca9d7e23fa0326c21f2e1.tar.gz bcfg2-2848627d82951554359ca9d7e23fa0326c21f2e1.tar.bz2 bcfg2-2848627d82951554359ca9d7e23fa0326c21f2e1.zip |
Replace bcfg2 proxy code with simplified code from Cobalt
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4226 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin')
-rwxr-xr-x | src/sbin/bcfg2 | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2 index 4dec93d43..444e9149f 100755 --- a/src/sbin/bcfg2 +++ b/src/sbin/bcfg2 @@ -19,13 +19,8 @@ import Bcfg2.Daemon from Bcfg2.Component import SimpleXMLRPCServer, ComponentInitError, ComponentKeyError, CobaltXMLRPCRequestHandler, TLSServer from Bcfg2.tlslite.errors import TLSNoAuthenticationError, TLSFingerprintError -try: - import Bcfg2.Client.Proxy - import Bcfg2.Logging -except KeyError: - print "Could not read options from configuration file" - raise SystemExit(1) - +import Bcfg2.Proxy +import Bcfg2.Logging def cb_sigint_handler(signum, frame): '''Exit upon CTRL-C''' @@ -157,8 +152,11 @@ class Client: else: # retrieve config from server try: - proxy = Bcfg2.Client.Proxy.bcfg2(self.setup) + proxy = Bcfg2.Proxy.ComponentProxy("bcfg2", False, + self.setup['user'], + self.setup['password']) except: + self.logger.debug("???", exc_info=1) self.fatal_error("failed to instantiate proxy to server") return(1) |