Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moving deltaproxy code into Salt open #60090

Merged
merged 24 commits into from
Aug 24, 2021
Merged

Moving deltaproxy code into Salt open #60090

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
1167430
Moving deltaproxy to open
garethgreenaway Apr 27, 2021
38ae85c
Initial work to add some basic tests for deltaproxy
garethgreenaway Apr 30, 2021
3f7458a
Adding the test.
garethgreenaway Apr 30, 2021
2c0dcc6
make sure we set the right proxy ID in case the controlproxy ID is de…
garethgreenaway May 3, 2021
348f991
skip __opts__ if it shows up in a loader context dictionary object. …
garethgreenaway May 4, 2021
e26c3e4
removing six references. removing unneeded code.
garethgreenaway May 4, 2021
eb63dc8
fixing cleanup of cache files in test_deltaproxy.py test_shell.py, an…
garethgreenaway May 4, 2021
64187dc
removing unneeded code. updating tests to use parameters.
garethgreenaway May 4, 2021
3072c71
including comment to explain why we are setting master in opts using …
garethgreenaway May 4, 2021
0fb6c44
removing more unneeded code.
garethgreenaway May 4, 2021
edbd845
Adding changelog
garethgreenaway May 11, 2021
f469b59
Updating napalm proxy minion to be deltaproxy aware and using __conte…
garethgreenaway Jul 30, 2021
0b4e318
Change the check for ConnectionClosedException being importable to im…
garethgreenaway May 26, 2021
dbcad08
fixing the __proxy_keepalive scheduled job for sub proxy minions, ens…
garethgreenaway May 26, 2021
c76ad0e
updating the rest_sample proxy minion to work with deltaproxy.
garethgreenaway Jun 11, 2021
277951d
Updating saltfactories calls to fix failing tests
garethgreenaway Jun 14, 2021
0422754
fixing napalm tests following changes for deltaproxy support.
garethgreenaway Jun 14, 2021
6854bbb
Adding a comment in a test to force various pre-commit bits to run
garethgreenaway Jun 15, 2021
875fc20
Forcing check_docs to run
garethgreenaway Jun 15, 2021
767b728
Forcing check_docs to run
garethgreenaway Jun 15, 2021
4f37110
requested changes.
garethgreenaway Jul 6, 2021
741b6ef
changing start event name to include salt/. Creating proxy_init_func…
garethgreenaway Jul 14, 2021
f957b3c
fixing lint.
garethgreenaway Jul 14, 2021
b2c465d
suggested changes
garethgreenaway Aug 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/60090.added
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Adding support for Deltaproxy controlled proxy minions into Salt Open.
1 change: 1 addition & 0 deletions doc/ref/proxy/all/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ proxy modules
chronos
cimc
cisconso
deltaproxy
docker
dummy
esxcluster
Expand Down
5 changes: 5 additions & 0 deletions doc/ref/proxy/all/salt.proxy.deltaproxy.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
salt.proxy.deltaproxy
=====================

.. automodule:: salt.proxy.deltaproxy
:members:
2 changes: 2 additions & 0 deletions salt/loader/lazy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,8 @@ def _load_module(self, name):

# pack whatever other globals we were asked to
for p_name, p_value in self.pack.items():
if p_name == "__opts__":
continue
mod_named_context = getattr(mod, p_name, None)
if hasattr(mod_named_context, "default"):
default = copy.deepcopy(mod_named_context.default)
Expand Down
Loading