diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2016-05-25 12:31:03 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2016-06-03 09:00:34 +0200 |
| commit | 56c66f44a0e356504bf8a7edcc924777adc1b352 (patch) | |
| tree | 116e503a2b25826f21ed6a10f131da96f6fedcd2 /ipalib | |
| parent | e056b8dea208ccde8e06b199809ce038ccd0531e (diff) | |
| download | freeipa-56c66f44a0e356504bf8a7edcc924777adc1b352.tar.gz freeipa-56c66f44a0e356504bf8a7edcc924777adc1b352.tar.xz freeipa-56c66f44a0e356504bf8a7edcc924777adc1b352.zip | |
rpc: specify connection options in API config
Specify RPC connection options once in API.bootstrap rather than in each
invocation of rpcclient.connect.
https://fedorahosted.org/freeipa/ticket/4739
Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipalib')
| -rw-r--r-- | ipalib/__init__.py | 2 | ||||
| -rw-r--r-- | ipalib/backend.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ipalib/__init__.py b/ipalib/__init__.py index 030a4f7d2..dffe2315e 100644 --- a/ipalib/__init__.py +++ b/ipalib/__init__.py @@ -949,7 +949,7 @@ api = create_api(mode=None) if os.environ.get('IPA_UNIT_TEST_MODE', None) == 'cli_test': from ipalib.cli import cli_plugins - api.bootstrap(context='cli', in_server=False, in_tree=True) + api.bootstrap(context='cli', in_server=False, in_tree=True, fallback=False) for klass in cli_plugins: api.add_plugin(klass) api.finalize() diff --git a/ipalib/backend.py b/ipalib/backend.py index 1bfb3e401..720d9781a 100644 --- a/ipalib/backend.py +++ b/ipalib/backend.py @@ -122,8 +122,7 @@ class Executioner(Backend): if self.env.in_server: self.Backend.ldap2.connect(ccache=ccache) else: - self.Backend.rpcclient.connect(verbose=self.env.verbose, - fallback=self.env.fallback, delegate=self.env.delegate) + self.Backend.rpcclient.connect() if client_ip is not None: setattr(context, "client_ip", client_ip) |