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.

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

Add salt-api on Windows platform #48001

Merged
merged 3 commits into from Jun 11, 2018
Merged

Add salt-api on Windows platform #48001

merged 3 commits into from Jun 11, 2018

Conversation

@rares-pop
Copy link
Contributor

@rares-pop rares-pop commented Jun 6, 2018

salt-api is broken on Windows platform
due to pickling issues on the salt.loader.netapi
Workaround that by creating a runner class
that can be pickled.

Signed-off-by: Rares POP rares.pop@ni.com

What does this PR do?

It adds/fixes salt-api on the Windows platform, using rest_cherrypy module

Previous Behavior

salt-api wasn't available on Windows

New Behavior

The user is able to run the salt-api daemon on windows, using rest_cherrypy module

Tests written?

No

Commits signed with GPG?

No

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

@ghost ghost requested review from Jun 6, 2018
isbm
isbm approved these changes Jun 7, 2018
@rallytime rallytime requested a review from Jun 7, 2018
dwoz
dwoz approved these changes Jun 8, 2018
@rallytime
Copy link
Contributor

@rallytime rallytime commented Jun 8, 2018

@rares-pop Can you add this to the Fluorine release notes?

rares-pop added 2 commits Jun 11, 2018
salt-api is broken on Windows platform
due to pickling issues on the salt.loader.netapi
Workaround that by creating a runner class
that can be pickled.

Signed-off-by: Rares POP <rares.pop@ni.com>
Signed-off-by: Rares POP <rares.pop@ni.com>
@rares-pop
Copy link
Contributor Author

@rares-pop rares-pop commented Jun 11, 2018

I did add a release note, but please review it and tell me if it looks right.

Copy link
Contributor

@rallytime rallytime left a comment

Thanks @rares-pop!

I have a couple of very small requests. Once those are fixed up, we can get this in. :)

@@ -624,3 +624,14 @@ New style for including from a parent directory:
.. code-block:: jinja

{% from '../foo' import bar %}

salt-api
============================
Copy link
Contributor

@rallytime rallytime Jun 11, 2018

This is picky, but can you make this line the same length as the text?

salt-api
========

We just spent a bunch of time fixing up RST syntax errors, so we want to keep these clean :D

============================

salt-api Windows support
--------------------------------
Copy link
Contributor

@rallytime rallytime Jun 11, 2018

Same comment here.

--------------------------------

Previously, salt-api was was not supported on the Microsoft Windows platforms. Now it is!
salt-api is providing a RESTful interface to a running Salt system. It allows
Copy link
Contributor

@rallytime rallytime Jun 11, 2018

salt-api is providing should be salt-api provides

Previously, salt-api was was not supported on the Microsoft Windows platforms. Now it is!
salt-api is providing a RESTful interface to a running Salt system. It allows
for viewing minions, runners, and jobs as well as running execution modules
and runners of a running Salt system through a REST API that returns JSON.
Copy link
Contributor

@rallytime rallytime Jun 11, 2018

Adding a link to the Salt-API documentation might be a good idea here. :)

Copy link
Contributor Author

@rares-pop rares-pop Jun 11, 2018

Regarding Salt-API documentation, do you mean:
https://salt.readthedocs.io/projects/salt-api
or
https://docs.saltstack.com/topics/netapi/index.html
or something else?

Copy link
Contributor

@rallytime rallytime Jun 11, 2018

Ah, sorry I was unclear. The second one: https://docs.saltstack.com/en/latest/topics/netapi/index.html

Signed-off-by: Rares POP <rares.pop@ni.com>
@rallytime rallytime merged commit 037d198 into saltstack:develop Jun 11, 2018
4 of 10 checks passed
@rares-pop rares-pop deleted the dev/iepopr/add_salt-api_windows branch Jun 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants