From 356d99ef265491ed7b35d50ab0351030469839cf Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 8 Apr 2021 20:27:37 +0200 Subject: [PATCH] committing changes in /etc made by "apt dist-upgrade -y" Package changes: +python3-apt 1.8.4.3 amd64 +python3-dateutil 2.7.3-3 all +python3-distro 1.3.0-1 all +python3-jinja2 2.10-2 all +python3-markupsafe 1.1.0-1 amd64 +python3-msgpack 0.5.6-1+b1 amd64 +python3-psutil 5.5.1-1 amd64 +python3-pycryptodome 3.6.1-2+b1 amd64 +python3-systemd 234-2+b1 amd64 +python3-yaml 3.13-2 amd64 +python3-zmq 17.1.2-2+deb10u1 amd64 -salt-common 2019.2.0+ds-1 all -salt-minion 2019.2.0+ds-1 all +salt-common 3003+ds-1 all +salt-minion 3003+ds-1 all --- salt/minion | 44 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/salt/minion b/salt/minion index f2b6655..b87397e 100644 --- a/salt/minion +++ b/salt/minion @@ -42,7 +42,7 @@ # value to "str". Failover masters can be requested by setting # to "failover". MAKE SURE TO SET master_alive_interval if you are # using failover. -# Setting master_type to 'disable' let's you have a running minion (with engines and +# Setting master_type to 'disable' lets you have a running minion (with engines and # beacons) without a master connection # master_type: str @@ -118,6 +118,13 @@ # set this config to ``False``. #minion_id_caching: True +# Convert minion id to lowercase when it is being generated. Helpful when some +# hosts get the minion id in uppercase. Cached ids will remain the same and +# not converted. For example, Windows minions often have uppercase minion +# names when they are set up but not always. To turn on, set this config to +# ``True``. +#minion_id_lowercase: False + # Append a domain to a hostname in the event that it does not exist. This is # useful for systems where socket.getfqdn() does not actually result in a # FQDN (for instance, Solaris). @@ -157,6 +164,16 @@ # Set the directory used to hold unix sockets. #sock_dir: /var/run/salt/minion +# In order to calculate the fqdns grain, all the IP addresses from the minion +# are processed with underlying calls to `socket.gethostbyaddr` which can take +# 5 seconds to be released (after reaching `socket.timeout`) when there is no +# fqdn for that IP. These calls to `socket.gethostbyaddr` are processed +# asynchronously, however, it still adds 5 seconds every time grains are +# generated if an IP does not resolve. In Windows grains are regenerated each +# time a new process is spawned. Therefore, the default for Windows is `False`. +# All other OSes default to `True` +# enable_fqdns_grains: True + # The minion can take a while to start up when lspci and/or dmidecode is used # to populate the grains for the minion. Set this to False if you do not need # GPU hardware grains for your minion. @@ -315,7 +332,7 @@ # reconnect 9: wait 33 seconds # reconnect x: etc. # -# In a setup with ~6000 thousand hosts these settings would average the reconnects +# In a setup with ~6000 hosts these settings would average the reconnects # to about 100 per second and all hosts would be reconnected within 60 seconds. # recon_default: 100 # recon_max: 5000 @@ -391,7 +408,7 @@ #mine_interval: 60 # Windows platforms lack posix IPC and must rely on slower TCP based inter- -# process communications. Set ipc_mode to 'tcp' on such systems +# process communications. ipc_mode is set to 'tcp' on such systems. #ipc_mode: ipc # Overwrite the default tcp ports used by the minion when ipc_mode is set to 'tcp' @@ -513,11 +530,14 @@ # enabled and can be disabled by changing this value to False. #clean_dynamic_modules: True # -# Normally, the minion is not isolated to any single environment on the master +# Renamed from ``environment`` to ``saltenv``. If ``environment`` is used, +# ``saltenv`` will take its value. If both are used, ``environment`` will be +# ignored and ``saltenv`` will be used. +# Normally the minion is not isolated to any single environment on the master # when running states, but the environment can be isolated on the minion side # by statically setting it. Remember that the recommended way to manage # environments is to isolate via the top file. -#environment: None +#saltenv: None # # Isolates the pillar environment on the minion side. This functions the same # as the environment setting, but for pillar instead of states. @@ -548,6 +568,11 @@ # - edit.vim # - hyper # +# List of grains to pass in start event when minion starts up: +#start_event_grains: +# - machine_id +# - uuid +# # Top file to execute if startup_states is 'top': #top_file: '' @@ -560,6 +585,15 @@ # #state_aggregate: False +# Disable requisites during state runs by specifying a single requisite +# or a list of requisites to disable. +# +# disabled_requisites: require_in +# +# disabled_requisites: +# - require +# - require_in + ##### File Directory Settings ##### ########################################## # The Salt Minion can redirect all file server operations to a local directory, -- 2.39.5