diff options
Diffstat (limited to 'src/lib/Bcfg2/Client')
| -rw-r--r-- | src/lib/Bcfg2/Client/Proxy.py | 10 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/RcUpdate.py | 4 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Client/__init__.py | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/src/lib/Bcfg2/Client/Proxy.py b/src/lib/Bcfg2/Client/Proxy.py index 98d081b10..a464d6a40 100644 --- a/src/lib/Bcfg2/Client/Proxy.py +++ b/src/lib/Bcfg2/Client/Proxy.py @@ -356,7 +356,7 @@ class ComponentProxy(xmlrpclib.ServerProxy): options = [ Bcfg2.Options.Common.location, Bcfg2.Options.Common.ssl_key, Bcfg2.Options.Common.ssl_cert, Bcfg2.Options.Common.ssl_ca, - Bcfg2.Options.Common.password, + Bcfg2.Options.Common.password, Bcfg2.Options.Common.client_timeout, Bcfg2.Options.Option( "-u", "--user", default="root", cf=('communication', 'user'), help='The user to provide for authentication'), @@ -371,11 +371,7 @@ class ComponentProxy(xmlrpclib.ServerProxy): Bcfg2.Options.Option( '--ssl-cns', cf=('communication', 'serverCommonNames'), type=Bcfg2.Options.Types.colon_list, - help='List of server commonNames'), - Bcfg2.Options.Option( - "-t", "--timeout", type=float, default=90.0, - cf=('communication', 'timeout'), - help='Set the client XML-RPC timeout')] + help='List of server commonNames')] def __init__(self): RetryMethod.max_retries = Bcfg2.Options.setup.retries @@ -394,6 +390,6 @@ class ComponentProxy(xmlrpclib.ServerProxy): Bcfg2.Options.setup.cert, Bcfg2.Options.setup.ca, Bcfg2.Options.setup.ssl_cns, - Bcfg2.Options.setup.timeout) + Bcfg2.Options.setup.client_timeout) xmlrpclib.ServerProxy.__init__(self, url, allow_none=True, transport=ssl_trans) diff --git a/src/lib/Bcfg2/Client/Tools/RcUpdate.py b/src/lib/Bcfg2/Client/Tools/RcUpdate.py index e0c913dcd..a482dbc00 100644 --- a/src/lib/Bcfg2/Client/Tools/RcUpdate.py +++ b/src/lib/Bcfg2/Client/Tools/RcUpdate.py @@ -98,10 +98,10 @@ class RcUpdate(Bcfg2.Client.Tools.SvcTool): # make sure service is disabled on boot bootcmd = '/sbin/rc-update del %s default' bootcmdrv = self.cmd.run(bootcmd % entry.get('name')).success - if self.setup['servicemode'] == 'disabled': + if Bcfg2.Options.setup.service_mode == 'disabled': # 'disabled' means we don't attempt to modify running svcs return bootcmdrv - buildmode = self.setup['servicemode'] == 'build' + buildmode = Bcfg2.Options.setup.service_mode == 'build' if (entry.get('status') == 'on' and not buildmode) and \ entry.get('current_status') == 'off': svccmdrv = self.start_service(entry) diff --git a/src/lib/Bcfg2/Client/__init__.py b/src/lib/Bcfg2/Client/__init__.py index e31ef47fe..811e5e50b 100644 --- a/src/lib/Bcfg2/Client/__init__.py +++ b/src/lib/Bcfg2/Client/__init__.py @@ -311,7 +311,7 @@ class Client(object): # TODO: read decision list from --decision-list Bcfg2.Options.setup.decision_list = \ self.proxy.GetDecisionList( - Bcfg2.Options.setup.decision) + Bcfg2.Options.setup.decision) self.logger.info("Got decision list from server:") self.logger.info(Bcfg2.Options.setup.decision_list) except Proxy.ProxyError: |