valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20445 from whiteinge/doc-preseed-key-links

Browse Source 
Add cross-refs to other ways to preseed minion keys
This commit is contained in:
Thomas S Hatch 2015-02-06 10:34:37 -07:00
commit 15b1a459ba
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/topics/tutorials/preseed_key.rst
View File

@ -7,6 +7,18 @@ accepting its key on the master. For instance, you may want the minion to
bootstrap itself as soon as it comes online. You may also want to to let your bootstrap itself as soon as it comes online. You may also want to to let your
developers provision new development machines on the fly. developers provision new development machines on the fly.
.. seealso:: Many ways to preseed minion keys
Salt has other ways to generate and pre-accept minion keys in addition to
the manual steps outlined below.
salt-cloud performs these same steps automatically when new cloud VMs are
created (unless instructed not to).
salt-api exposes an HTTP call to Salt's REST API to :py:class:`generate and
download the new minion keys as a tarball
<salt.netapi.rest_cherrypy.app.Keys>`.
There is a general four step process to do this: There is a general four step process to do this:
1. Generate the keys on the master: 1. Generate the keys on the master:

2
salt/netapi/rest_cherrypy/app.py
View File

@ -1048,7 +1048,7 @@ class Keys(LowDataAdapter):
.. versionadded:: 2014.7.0 .. versionadded:: 2014.7.0
These URLs wrap the functionality provided by the :py:module:`key wheel These URLs wrap the functionality provided by the :py:mod:`key wheel
module <salt.wheel.key>` functions. module <salt.wheel.key>` functions.
''' '''