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

Conversation

Projects
None yet
5 participants
@rares-pop
Copy link
Contributor

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.

@salt-jenkins salt-jenkins requested review from saltstack/team-core Jun 6, 2018

@isbm

isbm approved these changes Jun 7, 2018

@rallytime rallytime requested a review from saltstack/team-windows Jun 7, 2018

@dwoz

dwoz approved these changes Jun 8, 2018

@rallytime

This comment has been minimized.

Copy link
Contributor

commented Jun 8, 2018

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

Add salt-api on Windows platform
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>

@rares-pop rares-pop force-pushed the rares-pop:dev/iepopr/add_salt-api_windows branch from 174dc2e to c640b5c Jun 11, 2018

Merge branch 'develop' into dev/iepopr/add_salt-api_windows
Signed-off-by: Rares POP <rares.pop@ni.com>
@rares-pop

This comment has been minimized.

Copy link
Contributor Author

commented Jun 11, 2018

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

@rallytime
Copy link
Contributor

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
============================

This comment has been minimized.

Copy link
@rallytime

rallytime Jun 11, 2018

Contributor

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
--------------------------------

This comment has been minimized.

Copy link
@rallytime

rallytime Jun 11, 2018

Contributor

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

This comment has been minimized.

Copy link
@rallytime

rallytime Jun 11, 2018

Contributor

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.

This comment has been minimized.

Copy link
@rallytime

rallytime Jun 11, 2018

Contributor

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

This comment has been minimized.

Copy link
@rares-pop

rares-pop Jun 11, 2018

Author Contributor

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?

This comment has been minimized.

Copy link
@rallytime
Add fluorine release notes for salt-api
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

jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #10606 — ABORTED
Details
codeclimate 3 issues to fix
Details
default Build finished.
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #5635 — FAILURE
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22529 — FAILURE
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #19689 — FAILURE
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #25833 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #17898 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #23565 — SUCCESS
Details

@rares-pop rares-pop deleted the rares-pop: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
You can’t perform that action at this time.