mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Merge branch 'nocolor' of git://github.com/amenonsen/ansible into devel
This commit is contained in:
commit
633abca916
3 changed files with 7 additions and 1 deletions
|
@ -88,6 +88,10 @@ filter_plugins = /usr/share/ansible_plugins/filter_plugins
|
||||||
# set to 1 if you don't want cowsay support or export ANSIBLE_NOCOWS=1
|
# set to 1 if you don't want cowsay support or export ANSIBLE_NOCOWS=1
|
||||||
#nocows = 1
|
#nocows = 1
|
||||||
|
|
||||||
|
# don't like colors either?
|
||||||
|
# set to 1 if you don't want colors, or export ANSIBLE_NOCOLOR=1
|
||||||
|
#nocolor = 1
|
||||||
|
|
||||||
[paramiko_connection]
|
[paramiko_connection]
|
||||||
|
|
||||||
# uncomment this line to cause the paramiko connection plugin to not record new host
|
# uncomment this line to cause the paramiko connection plugin to not record new host
|
||||||
|
|
|
@ -17,9 +17,10 @@
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
import constants
|
||||||
|
|
||||||
ANSIBLE_COLOR=True
|
ANSIBLE_COLOR=True
|
||||||
if os.getenv("ANSIBLE_NOCOLOR") is not None:
|
if constants.ANSIBLE_NOCOLOR is not None:
|
||||||
ANSIBLE_COLOR=False
|
ANSIBLE_COLOR=False
|
||||||
elif not hasattr(sys.stdout, 'isatty') or not sys.stdout.isatty():
|
elif not hasattr(sys.stdout, 'isatty') or not sys.stdout.isatty():
|
||||||
ANSIBLE_COLOR=False
|
ANSIBLE_COLOR=False
|
||||||
|
|
|
@ -125,6 +125,7 @@ DEFAULT_VARS_PLUGIN_PATH = get_config(p, DEFAULTS, 'vars_plugins', '
|
||||||
DEFAULT_FILTER_PLUGIN_PATH = get_config(p, DEFAULTS, 'filter_plugins', 'ANSIBLE_FILTER_PLUGINS', '/usr/share/ansible_plugins/filter_plugins')
|
DEFAULT_FILTER_PLUGIN_PATH = get_config(p, DEFAULTS, 'filter_plugins', 'ANSIBLE_FILTER_PLUGINS', '/usr/share/ansible_plugins/filter_plugins')
|
||||||
DEFAULT_LOG_PATH = shell_expand_path(get_config(p, DEFAULTS, 'log_path', 'ANSIBLE_LOG_PATH', ''))
|
DEFAULT_LOG_PATH = shell_expand_path(get_config(p, DEFAULTS, 'log_path', 'ANSIBLE_LOG_PATH', ''))
|
||||||
|
|
||||||
|
ANSIBLE_NOCOLOR = get_config(p, DEFAULTS, 'nocolor', 'ANSIBLE_NOCOLOR', None)
|
||||||
ANSIBLE_NOCOWS = get_config(p, DEFAULTS, 'nocows', 'ANSIBLE_NOCOWS', None)
|
ANSIBLE_NOCOWS = get_config(p, DEFAULTS, 'nocows', 'ANSIBLE_NOCOWS', None)
|
||||||
ANSIBLE_SSH_ARGS = get_config(p, 'ssh_connection', 'ssh_args', 'ANSIBLE_SSH_ARGS', None)
|
ANSIBLE_SSH_ARGS = get_config(p, 'ssh_connection', 'ssh_args', 'ANSIBLE_SSH_ARGS', None)
|
||||||
PARAMIKO_RECORD_HOST_KEYS = get_config(p, 'paramiko_connection', 'record_host_keys', 'ANSIBLE_PARAMIKO_RECORD_HOST_KEYS', True, boolean=True)
|
PARAMIKO_RECORD_HOST_KEYS = get_config(p, 'paramiko_connection', 'record_host_keys', 'ANSIBLE_PARAMIKO_RECORD_HOST_KEYS', True, boolean=True)
|
||||||
|
|
Loading…
Reference in a new issue