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
Merged

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

merged 1 commit into from Mar 27, 2018

Conversation

vutny
Copy link
Contributor

@vutny 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 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
Copy link
Contributor

@rallytime rallytime Mar 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Copy link
Contributor Author

@vutny vutny Mar 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Contributor

@rallytime rallytime Mar 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Contributor

@rallytime rallytime Mar 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Copy link
Contributor Author

@vutny vutny Mar 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@vutny
Copy link
Contributor Author

@vutny 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
@vutny vutny deleted the 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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants