sync ansible config with upstream 2.4 version

roles/ansible-server/templates/ansible.cfg.j2

@@ -1,5 +1,5 @@
-# config file for ansible -- http://ansible.com/
+# config file for ansible -- https://ansible.com/
-# ==============================================
+# ===============================================
 
 # nearly all parameters can be overridden in ansible-playbook
 # or with command line flags. ansible will read ANSIBLE_CONFIG,
@@ -11,22 +11,23 @@
 
 # some basic default values...
 
-hostfile       = {{ ansible_base }}/ansible/inventory
+#inventory      = /etc/ansible/hosts
+inventory       = {{ ansible_base }}/ansible/inventory
+#library        = /usr/share/my_modules/
 library         = {{ ansible_base }}/ansible/library:/usr/share/ansible
-#remote_tmp     = $HOME/.ansible/tmp
+#module_utils   = /usr/share/my_module_utils/
-pattern        = *
+#remote_tmp     = ~/.ansible/tmp
+#local_tmp      = ~/.ansible/tmp
+#forks          = 5
 forks           = 125
-poll_interval  = 15
+#poll_interval  = 15
 #sudo_user      = root
 #ask_sudo_pass = True
 #ask_pass      = True
 #transport      = smart
 #remote_port    = 22
 #module_lang    = C
-
+#module_set_locale = False
-# We don't always want to be required to specify a name to get useful info
-# https://github.com/ansible/ansible/issues/14554
-display_args_to_stdout = True
 
 # plays will gather facts by default, which contain information about
 # the remote system.
@@ -34,17 +35,46 @@ display_args_to_stdout = True
 # smart - gather by default, but don't regather if already gathered
 # implicit - gather by default, turn off with gather_facts: False
 # explicit - do not gather by default, must say gather_facts: True
-gathering = smart
+#gathering = implicit
+
+# This only affects the gathering done by a play's gather_facts directive,
+# by default gathering retrieves all facts subsets
+# all - gather all subsets
+# network - gather min and network facts
+# hardware - gather hardware facts (longest facts to retrieve)
+# virtual - gather min and virtual facts
+# facter - import facts from facter
+# ohai - import facts from ohai
+# You can combine them using comma (ex: network,virtual)
+# You can negate them using ! (ex: !hardware,!facter,!ohai)
+# A minimal set of facts is always gathered.
+#gather_subset = all
+
+# some hardware related facts are collected
+# with a maximum timeout of 10 seconds. This
+# option lets you increase or decrease that
+# timeout to something more suitable for the
+# environment. 
+# gather_timeout = 10
 
 # additional paths to search for roles in, colon separated
+#roles_path    = /etc/ansible/roles
 roles_path     = {{ ansible_base }}/ansible/roles
 
 # uncomment this to disable SSH key host checking
 #host_key_checking = False
 
-# change the default callback
+# change the default callback, you can only have one 'stdout' type  enabled at a time.
 #stdout_callback = skippy
-# enable additional callbacks
+
+
+## Ansible ships with some plugins that require whitelisting,
+## this is done to avoid running all of a type by default.
+## These setting lists those that you want enabled for your system.
+## Custom plugins should not need this unless plugin author specifies it.
+
+# enable callback plugins, they can output to stdout but cannot be 'stdout' type.
+#callback_whitelist = timer, mail
 callback_whitelist = fedmsg_callback2,profile_tasks,logdetail2
 
 # Determine whether includes in tasks and handlers are "static" by
@@ -52,8 +82,12 @@ callback_whitelist = fedmsg_callback2,profile_tasks,logdetail2
 # values to True will make includes behave more like they did in the
 # 1.x versions.
 #task_includes_static = True
+#handler_includes_static = True
 handler_includes_static = True
 
+# Controls if a missing handler for a notification event is an error or a warning
+#error_on_missing_handler = True
+
 # change this for alternative sudo implementations
 #sudo_exe = sudo
 
@@ -62,7 +96,7 @@ handler_includes_static = True
 #sudo_flags = -H -S -n
 
 # SSH timeout
-timeout = 60
+#timeout = 10
 
 # default user to use for playbooks if user is not specified
 # (/usr/bin/ansible will use current user as default)
@@ -97,12 +131,17 @@ timeout = 60
 # if passing --private-key to ansible or ansible-playbook
 #private_key_file = /path/to/file
 
+# If set, configures the path to the Vault password file as an alternative to
+# specifying --vault-password-file on the command line.
+#vault_password_file = /path/to/vault_password_file
+
 # format of string {{ ansible_managed }} available within Jinja2
 # templates indicates to users editing templates files will be replaced.
 # replacing {file}, {host} and {uid} and strftime codes with proper values.
-ansible_managed = Ansible managed: {file} modified on %Y-%m-%d %H:%M:%S by {uid} on {host}
+#ansible_managed = Ansible managed: {file} modified on %Y-%m-%d %H:%M:%S by {uid} on {host}
-# This short version is better used in templates as it won't flag the file as changed every run.
+# {file}, {host}, {uid}, and the timestamp can all interfere with idempotence
-#ansible_managed = Ansible managed: {file} on {host}
+# in some situations so the default is a static string:
+#ansible_managed = Ansible managed
 
 # by default, ansible-playbook will display "Skipping [host]" if it determines a task
 # should not be run on a host.  Set this to "False" if you don't want to see these "Skipping"
@@ -110,6 +149,16 @@ ansible_managed = Ansible managed: {file} modified on %Y-%m-%d %H:%M:%S by {uid}
 # task is skipped.
 #display_skipped_hosts = True
 
+# by default, if a task in a playbook does not include a name: field then
+# ansible-playbook will construct a header that includes the task's action but
+# not the task's args.  This is a security feature because ansible cannot know
+# if the *module* considers an argument to be no_log at the time that the
+# header is printed.  If your environment doesn't have a problem securing
+# stdout from ansible-playbook (or you have manually specified no_log in your
+# playbook on all of the tasks where you have secret information) then you can
+# safely set this to True to get more informative messages.
+#display_args_to_stdout = False
+
 # by default (as of 1.3), Ansible will raise errors when attempting to dereference
 # Jinja2 variables that are not set in templates or action lines. Uncomment this line
 # to revert the behavior to pre-1.3.
@@ -134,13 +183,24 @@ ansible_managed = Ansible managed: {file} modified on %Y-%m-%d %H:%M:%S by {uid}
 # instead of shelling out to the git command.
 # command_warnings = False
 
-# set plugin path directories here, seperate with colons
+
-action_plugins     = {{ ansible_base }}/ansible/action_plugins:/usr/share/ansible_plugins/action_plugins
+# set plugin path directories here, separate with colons
-callback_plugins   = {{ ansible_base }}/ansible/callback_plugins:/usr/share/ansible_plugins/callback_plugins
+#action_plugins     = /usr/share/ansible/plugins/action
-connection_plugins = {{ ansible_base }}/ansible/connection_plugins:/usr/share/ansible_plugins/connection_plugins
+#cache_plugins      = /usr/share/ansible/plugins/cache
-lookup_plugins     = {{ ansible_base }}/ansible/lookup_plugins:/usr/share/ansible_plugins/lookup_plugins
+#callback_plugins   = /usr/share/ansible/plugins/callback
-vars_plugins       = {{ ansible_base }}/ansible/vars_plugins:/usr/share/ansible_plugins/vars_plugins
+#connection_plugins = /usr/share/ansible/plugins/connection
-filter_plugins     = {{ ansible_base }}/ansible/filter_plugins:/usr/share/ansible_plugins/filter_plugins
+#lookup_plugins     = /usr/share/ansible/plugins/lookup
+#inventory_plugins  = /usr/share/ansible/plugins/inventory
+#vars_plugins       = /usr/share/ansible/plugins/vars
+#filter_plugins     = /usr/share/ansible/plugins/filter
+#test_plugins       = /usr/share/ansible/plugins/test
+#terminal_plugins   = /usr/share/ansible/plugins/terminal
+#strategy_plugins   = /usr/share/ansible/plugins/strategy
+
+
+# by default, ansible will use the 'linear' strategy but you may want to try
+# another one
+#strategy = free
 
 # by default callbacks are not loaded for /bin/ansible, enable this if you
 # want, for example, a notification or logging callback to also apply to
@@ -183,9 +243,15 @@ filter_plugins     = {{ ansible_base }}/ansible/filter_plugins:/usr/share/ansibl
 # You can disable this feature by setting retry_files_enabled to False
 # and you can change the location of the files by setting retry_files_save_path
 
-retry_files_enabled = False
+#retry_files_enabled = False
 #retry_files_save_path = ~/.ansible-retry
 
+# squash actions
+# Ansible can optimise actions that call modules with list parameters
+# when looping. Instead of calling the module once per with_ item, the
+# module is called once with all items at once. Currently this only works
+# under limited circumstances, and only with parameters named 'name'.
+#squash_actions = apk,apt,dnf,homebrew,pacman,pkgng,yum,zypper
 
 # prevents logging of task data, off by default
 #no_log = False
@@ -193,10 +259,75 @@ retry_files_enabled = False
 # prevents logging of tasks, but only on the targets, data is still logged on the master/controller
 #no_target_syslog = False
 
+# controls whether Ansible will raise an error or warning if a task has no
+# choice but to create world readable temporary files to execute a module on
+# the remote machine.  This option is False by default for security.  Users may
+# turn this on to have behaviour more like Ansible prior to 2.1.x.  See
+# https://docs.ansible.com/ansible/become.html#becoming-an-unprivileged-user
+# for more secure ways to fix this than enabling this option.
+#allow_world_readable_tmpfiles = False
+
 # controls the compression level of variables sent to
 # worker processes. At the default of 0, no compression
 # is used. This value must be an integer from 0 to 9.
-#var_compression_level = 9
+var_compression_level = 9
+
+# controls what compression method is used for new-style ansible modules when
+# they are sent to the remote system.  The compression types depend on having
+# support compiled into both the controller's python and the client's python.
+# The names should match with the python Zipfile compression types:
+# * ZIP_STORED (no compression. available everywhere)
+# * ZIP_DEFLATED (uses zlib, the default)
+# These values may be set per host via the ansible_module_compression inventory
+# variable
+#module_compression = 'ZIP_DEFLATED'
+
+# This controls the cutoff point (in bytes) on --diff for files
+# set to 0 for unlimited (RAM may suffer!).
+#max_diff_size = 1048576
+
+# This controls how ansible handles multiple --tags and --skip-tags arguments
+# on the CLI.  If this is True then multiple arguments are merged together.  If
+# it is False, then the last specified argument is used and the others are ignored.
+# This option will be removed in 2.8.
+#merge_multiple_cli_flags = True
+
+# Controls showing custom stats at the end, off by default
+#show_custom_stats = True
+
+# Controls which files to ignore when using a directory as inventory with
+# possibly multiple sources (both static and dynamic)
+#inventory_ignore_extensions = ~, .orig, .bak, .ini, .cfg, .retry, .pyc, .pyo
+
+# This family of modules use an alternative execution path optimized for network appliances
+# only update this setting if you know how this works, otherwise it can break module execution
+#network_group_modules=['eos', 'nxos', 'ios', 'iosxr', 'junos', 'vyos']
+
+# This keeps facts from polluting the main namespace as variables.
+# Setting to True keeps them under the ansible_facts namespace, the default is False
+#restrict_facts_namespace: True
+
+# When enabled, this option allows lookups (via variables like {{lookup('foo')}} or when used as
+# a loop with `with_foo`) to return data that is not marked "unsafe". This means the data may contain
+# jinja2 templating language which will be run through the templating engine.
+# ENABLING THIS COULD BE A SECURITY RISK
+#allow_unsafe_lookups = False
+
+# set default errors for all plays
+#any_errors_fatal = False
+
+[inventory]
+# enable inventory plugins, default: 'host_list', 'script', 'yaml', 'ini'
+#enable_plugins = host_list, virtualbox, yaml, constructed
+
+# ignore these extensions when parsing a directory as inventory source
+#ignore_extensions = '.pyc', '.pyo', '.swp', '.bak', '~', '.rpm', '.md', '.txt', '~', '.orig', '.ini', '.cfg', '.retry'
+
+# ignore files matching these patterns when parsing a directory as inventory source
+#ignore_patterns=
+
+# If 'true' unparsed inventory sources become fatal errors, they are warnings otherwise.
+#unparsed_is_failed=False
 
 [privilege_escalation]
 #become=True
@@ -215,23 +346,42 @@ retry_files_enabled = False
 # line to disable this behaviour.
 #pty=False
 
+# paramiko will default to looking for SSH keys initially when trying to
+# authenticate to remote devices.  This is a problem for some network devices
+# that close the connection after a key failure.  Uncomment this line to
+# disable the Paramiko look for keys function
+#look_for_keys = False
+
+# When using persistent connections with Paramiko, the connection runs in a
+# background process.  If the host doesn't already have a valid SSH key, by
+# default Ansible will prompt to add the host key.  This will cause connections
+# running in background processes to fail.  Uncomment this line to have
+# Paramiko automatically add host keys.
+#host_key_auto_add = True
+
 [ssh_connection]
 
 # ssh arguments to use
 # Leaving off ControlPersist will result in poor performance, so use
-# paramiko on older platforms rather than removing it
+# paramiko on older platforms rather than removing it, -C controls compression use
-#ssh_args = -o ControlMaster=auto -o ControlPersist=60s
+#ssh_args = -C -o ControlMaster=auto -o ControlPersist=60s
+ssh_args = -C -o ControlMaster=auto -o ControlPersist=60s
 
-# The path to use for the ControlPath sockets. This defaults to
+# The base directory for the ControlPath sockets. 
-# "%(directory)s/ansible-ssh-%%h-%%p-%%r", however on some systems with
+# This is the "%(directory)s" in the control_path option
-# very long hostnames or very long path names (caused by long user names or 
+# 
-# deeply nested home directories) this can exceed the character limit on
+# Example: 
-# file socket names (108 characters for most platforms). In that case, you 
+# control_path_dir = /tmp/.ansible/cp
-# may wish to shorten the string below.
+#control_path_dir = ~/.ansible/cp
+
+# The path to use for the ControlPath sockets. This defaults to a hashed string of the hostname, 
+# port and username (empty string in the config). The hash mitigates a common problem users 
+# found with long hostames and the conventional %(directory)s/ansible-ssh-%%h-%%p-%%r format. 
+# In those cases, a "too long for Unix domain socket" ssh error would occur.
 #
 # Example:
 # control_path = %(directory)s/%%h-%%r
-#control_path = %(directory)s/ansible-ssh-%%h-%%p-%%r
+#control_path =
 
 # Enabling pipelining reduces the number of SSH operations required to
 # execute a module on the remote server. This can result in a significant
@@ -241,17 +391,49 @@ retry_files_enabled = False
 # By default, this option is disabled to preserve compatibility with
 # sudoers configurations that have requiretty (the default on many distros).
 #
+#pipelining = False
 pipelining = True
 
-# if True, make ansible use scp if the connection type is ssh 
+# Control the mechanism for transferring files (old)
-# (default is sftp)
+#   * smart = try sftp and then try scp [default]
-#scp_if_ssh = True
+#   * True = use scp only
+#   * False = use sftp only
+#scp_if_ssh = smart
+
+# Control the mechanism for transferring files (new)
+# If set, this will override the scp_if_ssh option
+#   * sftp  = use sftp to transfer files
+#   * scp   = use scp to transfer files
+#   * piped = use 'dd' over SSH to transfer files
+#   * smart = try sftp, scp, and piped, in that order [default]
+#transfer_method = smart
 
 # if False, sftp will not use batch mode to transfer files. This may cause some
 # types of file transfer failures impossible to catch however, and should
 # only be disabled if your sftp version has problems with batch mode
 #sftp_batch_mode = False
 
+[persistent_connection]
+
+# Configures the persistent connection timeout value in seconds.  This value is
+# how long the persistent connection will remain idle before it is destroyed.  
+# If the connection doesn't receive a request before the timeout value 
+# expires, the connection is shutdown. The default value is 30 seconds.
+#connect_timeout = 30
+
+# Configures the persistent connection retry timeout.  This value configures the
+# the retry timeout that ansible-connection will wait to connect
+# to the local domain socket. This value must be larger than the
+# ssh timeout (timeout) and less than persistent connection idle timeout (connect_timeout).
+# The default value is 15 seconds.
+#connect_retry_timeout = 15
+
+# The command timeout value defines the amount of time to wait for a command
+# or RPC call before timing out. The value for the command timeout must
+# be less than the value of the persistent connection idle timeout (connect_timeout)
+# The default value is 10 second.
+#command_timeout = 10
+
 [accelerate]
 #accelerate_port = 5099
 #accelerate_timeout = 30
@@ -271,4 +453,30 @@ pipelining = True
 # file systems that require special treatment when dealing with security context
 # the default behaviour that copies the existing context or uses the user default
 # needs to be changed to use the file system dependent context.
-#special_context_filesystems=nfs,vboxsf,fuse,ramfs
+#special_context_filesystems=nfs,vboxsf,fuse,ramfs,9p
+
+# Set this to yes to allow libvirt_lxc connections to work without SELinux.
+#libvirt_lxc_noseclabel = yes
+
+[colors]
+#highlight = white
+#verbose = blue
+#warn = bright purple
+#error = red
+#debug = dark gray
+#deprecate = purple
+#skip = cyan
+#unreachable = red
+#ok = green
+#changed = yellow
+#diff_add = green
+#diff_remove = red
+#diff_lines = cyan
+
+
+[diff]
+# Always print diff when running ( same as always running with -D/--diff )
+# always = no
+
+# Set how many context lines to show in diff
+# context = 3