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

[DOC] Update FAQ about Salt self-restarting #46709

Merged
merged 1 commit into from Mar 27, 2018

Conversation

@vutny
Copy link
Contributor

vutny commented Mar 26, 2018

What does this PR do?

Corrects the FAQ section on restarting a Salt Minion:

  • The "masterless mode" (--local) is no longer necessary
  • Salt Master could be restarted just like a Minion

What issues does this PR fix or reference?

Should finally resolve #5721

Commits signed with GPG?

Yes

Copy link
Contributor

rallytime left a comment

Thanks @vutny! This will be much more clear. I have a couple of suggestions and some grammatical changes. Otherwise, LGTM!

doc/faq.rst Outdated
other states have been applied. This allows the minion to keep Minion to Master
connection alive for the Minion to report the final results to the Master, while
the service is restarting in the background.
Minion service in background by issuing ``salt-call`` command calling

This comment has been minimized.

Copy link
@rallytime

rallytime Mar 26, 2018

Contributor

I think in background by issuing --> in the background by issuing a is more readable. (Note the the and the a.)

I know the above line wasn't yours, but since we're here, can you also update restarting of the --> restarting the?

This comment has been minimized.

Copy link
@vutny

vutny Mar 26, 2018

Author Contributor

Oh, those English articles! 😃

doc/faq.rst Outdated
{%- endif %}
- bg: True
- onchanges:
- pkg: Upgrade Salt Minion

However, it requires more advanced tricks to upgrade from legacy version of
Salt (before ``2016.3.0``) on UNIX-like operating systems, where executing
commands in the background is not supported:
commands in the background is not supported. You also may need to schedule
restarting of the Minion service using :ref:`masterless mode

This comment has been minimized.

Copy link
@rallytime

rallytime Mar 26, 2018

Contributor

restarting of the --> restarting the

doc/faq.rst Outdated
commands in the background is not supported. You also may need to schedule
restarting of the Minion service using :ref:`masterless mode
<masterless-quickstart>` after all other states have been applied for Salt
version earlier than ``2016.11.0``. This allows the minion to keep the Minion

This comment has been minimized.

Copy link
@rallytime

rallytime Mar 26, 2018

Contributor

version --> versions

And I think this part:

This allows the minion to keep the Minion

could be clearer. Maybe something like This allows the Minion to keep the Minion-Master connection alive ...

What do you think?

This comment has been minimized.

Copy link
@vutny

vutny Mar 26, 2018

Author Contributor

Yep, that does not sound well. I will fix all these stuff. Thanks for reviewing!

@vutny vutny force-pushed the vutny:doc-faq-minion-master-restart branch from 8f1862b to 54bf10a Mar 26, 2018
Fixes #5721
@vutny vutny force-pushed the vutny:doc-faq-minion-master-restart branch from 54bf10a to d092928 Mar 26, 2018
@vutny

This comment has been minimized.

Copy link
Contributor Author

vutny commented Mar 26, 2018

@rallytime Thanks for grammar check again! 😄 I think I've sorted all of this out.

@rallytime rallytime merged commit 554400e into saltstack:2017.7 Mar 27, 2018
6 of 9 checks passed
6 of 9 checks passed
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #8206 — ABORTED
Details
default Build finished.
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #17518 — FAILURE
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #23601 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #15826 — SUCCESS
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #3479 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #21146 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #20444 — SUCCESS
Details
@vutny vutny deleted the vutny:doc-faq-minion-master-restart branch Mar 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.