Merge pull request #37499 from cachedout/key_docs_clarify

Clarify docs on salt-key events
This commit is contained in:
Mike Place 2016-11-07 22:33:20 +13:00 committed by GitHub
commit d95bf59f97

View file

@ -43,10 +43,10 @@ Key events
.. salt:event:: salt/key
Fired when accepting and rejecting minions keys on the Salt master.
These happen as a result of actions undertaken by the `salt-key` command.
:var id: The minion ID.
:var act: The new status of the minion key: ``accept``, ``pend``,
``reject``.
:var act: The new status of the minion key: ``accept``, ``delete``,
.. warning:: If a master is in :conf_master:`auto_accept mode`, ``salt/key`` events
will not be fired when the keys are accepted. In addition, pre-seeding