summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2008-03-27 01:54:56 +0000
committerNarayan Desai <desai@mcs.anl.gov>2008-03-27 01:54:56 +0000
commit387165b8651d60f61517997a735e1e9c03894a15 (patch)
treef98a3b42b28273dff70fb3feac4b1b43eab2bca0
parent36c2b1444389cfa7c7534a7a180353317667720e (diff)
downloadbcfg2-387165b8651d60f61517997a735e1e9c03894a15.tar.gz
bcfg2-387165b8651d60f61517997a735e1e9c03894a15.tar.bz2
bcfg2-387165b8651d60f61517997a735e1e9c03894a15.zip
fingerprint fix from ritcey
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4457 ce84e21b-d406-0410-9b95-82705330c041
-rwxr-xr-xsrc/sbin/bcfg28
1 files changed, 7 insertions, 1 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2
index 50e5c616a..4912e9d02 100755
--- a/src/sbin/bcfg2
+++ b/src/sbin/bcfg2
@@ -26,6 +26,10 @@ def cb_sigint_handler(signum, frame):
'''Exit upon CTRL-C'''
os._exit(1)
+DECISION_LIST = Bcfg2.Options.Option('Decision List', default=False,
+ cmd="--decision-list", odesc='<file>',
+ long_arg=True)
+
class Client:
''' The main bcfg2 client class '''
@@ -62,6 +66,7 @@ class Client:
'agent-port': Bcfg2.Options.CLIENT_PORT,
'agent-background': Bcfg2.Options.CLIENT_BACKGROUND,
'key': Bcfg2.Options.SERVER_KEY,
+ 'decision-list': DECISION_LIST,
}
self.setup = Bcfg2.Options.OptionParser(optinfo)
@@ -154,7 +159,8 @@ class Client:
try:
proxy = Bcfg2.Proxy.ComponentProxy(self.setup['server'],
self.setup['user'],
- self.setup['password'])
+ self.setup['password'],
+ self.setup['fingerprint'])
except:
self.logger.debug("???", exc_info=1)
self.fatal_error("failed to instantiate proxy to server")