diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2014-10-15 16:25:12 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2014-10-15 17:05:26 +0200 |
| commit | 1aeff29bfb5fb35c075c310e0af235ccf286fc48 (patch) | |
| tree | e2d1edd5bae370a2a5a91abff8bfa2c2250e38f8 /src/lib/Bcfg2/Client/Proxy.py | |
| parent | 45e07c7714116b7b88c40a55728be0c0b3c8a0fb (diff) | |
| download | bcfg2-1aeff29bfb5fb35c075c310e0af235ccf286fc48.tar.gz bcfg2-1aeff29bfb5fb35c075c310e0af235ccf286fc48.tar.bz2 bcfg2-1aeff29bfb5fb35c075c310e0af235ccf286fc48.zip | |
Options: add missing communication:protocol options
The option was there in bcfg2-1.3.x and is still documented (maybe it just
got lost during the options rewrite).
Diffstat (limited to 'src/lib/Bcfg2/Client/Proxy.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Proxy.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Client/Proxy.py b/src/lib/Bcfg2/Client/Proxy.py index 0cc479843..5c00634f6 100644 --- a/src/lib/Bcfg2/Client/Proxy.py +++ b/src/lib/Bcfg2/Client/Proxy.py @@ -232,7 +232,8 @@ class SSLHTTPConnection(httplib.HTTPConnection): class XMLRPCTransport(xmlrpclib.Transport): def __init__(self, key=None, cert=None, ca=None, - scns=None, use_datetime=0, timeout=90): + scns=None, use_datetime=0, timeout=90, + protocol='xmlrpc/ssl'): if hasattr(xmlrpclib.Transport, '__init__'): xmlrpclib.Transport.__init__(self, use_datetime) self.key = key @@ -240,6 +241,7 @@ class XMLRPCTransport(xmlrpclib.Transport): self.ca = ca self.scns = scns self.timeout = timeout + self.protocol = protocol def make_connection(self, host): host, self._extra_headers = self.get_host_info(host)[0:2] @@ -248,7 +250,8 @@ class XMLRPCTransport(xmlrpclib.Transport): cert=self.cert, ca=self.ca, scns=self.scns, - timeout=self.timeout) + timeout=self.timeout, + protocol=self.protocol) def request(self, host, handler, request_body, verbose=0): """Send request to server and return response.""" @@ -293,6 +296,7 @@ class ComponentProxy(xmlrpclib.ServerProxy): options = [ Bcfg2.Options.Common.location, Bcfg2.Options.Common.ssl_ca, Bcfg2.Options.Common.password, Bcfg2.Options.Common.client_timeout, + Bcfg2.Options.Common.protocol, Bcfg2.Options.PathOption( '--ssl-key', cf=('communication', 'key'), dest="key", help='Path to SSL key'), @@ -332,6 +336,7 @@ class ComponentProxy(xmlrpclib.ServerProxy): Bcfg2.Options.setup.cert, Bcfg2.Options.setup.ca, Bcfg2.Options.setup.ssl_cns, - Bcfg2.Options.setup.client_timeout) + Bcfg2.Options.setup.client_timeout, + Bcfg2.Options.setup.protocol) xmlrpclib.ServerProxy.__init__(self, url, allow_none=True, transport=ssl_trans) |