env: Add 'server' variable to api.env

https://fedorahosted.org/freeipa/ticket/4739

Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
David Kupka
2016-06-21 14:41:17 +02:00
committed by Jan Cholasta
parent bf91c0f938
commit 65aa2d48ff
2 changed files with 10 additions and 0 deletions

View File

@@ -563,6 +563,15 @@ class Env(object):
self.jsonrpc_uri = urlunparse((
scheme, netloc, uripath, params, query, fragment))
if 'server' not in self:
if 'jsonrpc_uri' in self:
jsonrpc_uri = self.jsonrpc_uri
else:
jsonrpc_uri = defaults.get('jsonrpc_uri')
if jsonrpc_uri:
parsed = urlparse(jsonrpc_uri)
self.server = parsed.netloc
self._merge(**defaults)
def _finalize(self, **lastchance):

View File

@@ -231,6 +231,7 @@ DEFAULT_CONFIG = (
('logdir', object), # Directory containing log files
('log', object), # Path to context specific log file
('jsonrpc_uri', object), # derived from xmlrpc_uri in Env._finalize_core()
('server', object), # derived from jsonrpc_uri in Env._finalize_core()
)