cbf630a579
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=185
70 lines
2.3 KiB
Diff
70 lines
2.3 KiB
Diff
From 843c76e5889659ec80fea3f39b750b9f907a902d Mon Sep 17 00:00:00 2001
|
|
From: Victor Zhestkov <35733135+vzhestkov@users.noreply.github.com>
|
|
Date: Wed, 17 Feb 2021 16:47:11 +0300
|
|
Subject: [PATCH] Async batch implementation fix (#320)
|
|
|
|
---
|
|
salt/client/__init__.py | 38 --------------------------------------
|
|
1 file changed, 38 deletions(-)
|
|
|
|
diff --git a/salt/client/__init__.py b/salt/client/__init__.py
|
|
index cc8fd4048d..ddb437604b 100644
|
|
--- a/salt/client/__init__.py
|
|
+++ b/salt/client/__init__.py
|
|
@@ -534,12 +534,6 @@ class LocalClient:
|
|
{'dave': {...}}
|
|
{'stewart': {...}}
|
|
"""
|
|
- # We need to re-import salt.utils.args here
|
|
- # even though it has already been imported.
|
|
- # when cmd_batch is called via the NetAPI
|
|
- # the module is unavailable.
|
|
- import salt.utils.args
|
|
-
|
|
# Late import - not used anywhere else in this file
|
|
import salt.cli.batch
|
|
|
|
@@ -557,38 +551,6 @@ class LocalClient:
|
|
|
|
eauth = salt.cli.batch.batch_get_eauth(kwargs)
|
|
|
|
- arg = salt.utils.args.condition_input(arg, kwarg)
|
|
- opts = {
|
|
- "tgt": tgt,
|
|
- "fun": fun,
|
|
- "arg": arg,
|
|
- "tgt_type": tgt_type,
|
|
- "ret": ret,
|
|
- "batch": batch,
|
|
- "failhard": kwargs.get("failhard", self.opts.get("failhard", False)),
|
|
- "raw": kwargs.get("raw", False),
|
|
- }
|
|
-
|
|
- if "timeout" in kwargs:
|
|
- opts["timeout"] = kwargs["timeout"]
|
|
- if "gather_job_timeout" in kwargs:
|
|
- opts["gather_job_timeout"] = kwargs["gather_job_timeout"]
|
|
- if "batch_wait" in kwargs:
|
|
- opts["batch_wait"] = int(kwargs["batch_wait"])
|
|
-
|
|
- eauth = {}
|
|
- if "eauth" in kwargs:
|
|
- eauth["eauth"] = kwargs.pop("eauth")
|
|
- if "username" in kwargs:
|
|
- eauth["username"] = kwargs.pop("username")
|
|
- if "password" in kwargs:
|
|
- eauth["password"] = kwargs.pop("password")
|
|
- if "token" in kwargs:
|
|
- eauth["token"] = kwargs.pop("token")
|
|
-
|
|
- for key, val in self.opts.items():
|
|
- if key not in opts:
|
|
- opts[key] = val
|
|
batch = salt.cli.batch.Batch(opts, eauth=eauth, quiet=True)
|
|
for ret in batch.run():
|
|
yield ret
|
|
--
|
|
2.30.0
|
|
|
|
|