Merge pull request #10334 from ajw0100/fix-hacking-doc

Ensure `master_port` in minion config matches `ret_port` in master config
This commit is contained in:
Thomas S Hatch 2014-02-11 15:14:04 -07:00
commit dac00f0c47
2 changed files with 6 additions and 0 deletions

View File

@ -213,6 +213,9 @@ Edit the minion config file:
4. Uncomment and change the ``id:`` value to something descriptive like
"saltdev". This isn't strictly necessary but it will serve as a reminder of
which Salt installation you are working with.
5. If you changed the ``ret_port`` value in the master config because you are
also running a non-development version of Salt, then you will have to
change the ``master_port`` value in the minion config to match.
.. note:: Using `salt-call` with a :doc:`Standalone Minion </topics/tutorials/standalone_minion>`

View File

@ -267,6 +267,9 @@ Edit the minion config file:
4. Uncomment and change the ``id:`` value to something descriptive like
"saltdev". This isn't strictly necessary but it will serve as a reminder of
which Salt installation you are working with.
5. If you changed the ``ret_port`` value in the master config because you are
also running a non-development version of Salt, then you will have to
change the ``master_port`` value in the minion config to match.
.. note:: Using `salt-call` with a :doc:`Standalone Minion </topics/tutorials/standalone_minion>`