Set default to false

This commit is contained in:
Mike Place 2014-09-17 14:38:42 -06:00
parent 0a4b370bc7
commit 50579b31cd
2 changed files with 11 additions and 8 deletions

View file

@ -122,19 +122,22 @@
# master event bus. The value is expressed in bytes.
#max_event_size: 1048576
# By default, the master AES key rotates every 24 hours. By default,
# a key rotatation triggers a test.ping of all connected minions so that
# they immediately reconnect. To disable this behaviour, set ping_on_rotate
# to False.
# By default, the master AES key rotates every 24 hours. The next command
# following a key rotation will trigger a key refresh from the minion which may
# result in minions which do not respond to the first command after a key refresh.
#
# To tell the master to ping all minions immediately after an AES key refresh, set
# ping_on_rotate to True. This should mitigate the issue where a minion does not
# appear to initially respond after a key is rotated.
#
# Note that ping_on_rotate may cause high load on the master immediately after
# the key rotation event as minions reconnect. Consider this carefully if this
# salt master is managing a large number of minions.
#
# If diabled, it is recommended to handle this event by listening for the
# If disabled, it is recommended to handle this event by listening for the
# 'aes_key_rotate' event with the 'key' tag and acting appropriately.
#
# ping_on_rotate: True
#
# ping_on_rotate: False
# The master can include configuration from other files. To enable this,
# pass a list of paths to this option. The paths can be either relative or

View file

@ -439,7 +439,7 @@ DEFAULT_MASTER_OPTS = {
'pillar_version': 2,
'pillar_opts': True,
'pillar_source_merging_strategy': 'smart',
'ping_on_key_rotate': True,
'ping_on_key_rotate': False,
'peer': {},
'syndic_master': '',
'runner_dirs': [],