diff options
| author | Sol Jerome <solj@ices.utexas.edu> | 2010-02-08 19:24:37 +0000 |
|---|---|---|
| committer | Sol Jerome <solj@ices.utexas.edu> | 2010-02-08 19:24:37 +0000 |
| commit | 42cffe6228369a75f27c14eea22ad13baf2c0854 (patch) | |
| tree | ed3a19a831c3b54b9d472671814d7bf77ab16eb5 /src/lib/Component.py | |
| parent | 8f265b38c7798d7933173d4dcbe9e6b3ad736c4c (diff) | |
| download | bcfg2-42cffe6228369a75f27c14eea22ad13baf2c0854.tar.gz bcfg2-42cffe6228369a75f27c14eea22ad13baf2c0854.tar.bz2 bcfg2-42cffe6228369a75f27c14eea22ad13baf2c0854.zip | |
Snapshots: Use custom bcfg2.conf when specified (Fix for #839)
Signed-off-by: Sol Jerome <solj@ices.utexas.edu>
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5716 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Component.py')
| -rw-r--r-- | src/lib/Component.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/Component.py b/src/lib/Component.py index 727952c6f..33ed635af 100644 --- a/src/lib/Component.py +++ b/src/lib/Component.py @@ -24,9 +24,9 @@ class NoExposedMethod (Exception): """There is no method exposed with the given name.""" def run_component(component_cls, location, daemon, pidfile_name, to_file, - argv=None, register=True, state_name=False, cls_kwargs={}, - extra_getopt='', time_out=10, protocol='xmlrpc/ssl', - certfile=None, keyfile=None, ca=None): + cfile='/etc/bcfg2.conf', argv=None, register=True, + state_name=False, cls_kwargs={}, extra_getopt='', time_out=10, + protocol='xmlrpc/ssl', certfile=None, keyfile=None, ca=None): # default settings level = logging.INFO @@ -59,7 +59,7 @@ def run_component(component_cls, location, daemon, pidfile_name, to_file, print >> pidfile, os.getpid() pidfile.close() - component = component_cls(**cls_kwargs) + component = component_cls(cfile=cfile, **cls_kwargs) up = urlparse.urlparse(location) port = tuple(up[1].split(':')) port = (port[0], int(port[1])) |