diff options
| author | Brian Coca <bcoca@ansible.com> | 2015-08-23 13:32:15 -0400 |
|---|---|---|
| committer | Brian Coca <bcoca@ansible.com> | 2015-08-23 13:32:15 -0400 |
| commit | a4ffa09414d4ca115a012a122e1a085a82f380bb (patch) | |
| tree | d5fd13512439b3d4354ffff86d24e5ba61e75d75 | |
| parent | e11d56c06baa7aebd4148e99ddad23ff4ee6f67b (diff) | |
| parent | 50efeb13bab572bcb5a2163fd2dea2d1785d4967 (diff) | |
| download | ansible-a4ffa09414d4ca115a012a122e1a085a82f380bb.tar.gz | |
Merge pull request #11880 from bcoca/configurable_squash
made squashable with_ plugin list configurable
| -rw-r--r-- | lib/ansible/constants.py | 7 | ||||
| -rw-r--r-- | lib/ansible/executor/task_executor.py | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index 8cb3bcb2fb..376d2d54ad 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -177,7 +177,9 @@ DEFAULT_BECOME_FLAGS = get_config(p, 'privilege_escalation', 'become_flags' DEFAULT_BECOME_ASK_PASS = get_config(p, 'privilege_escalation', 'become_ask_pass', 'ANSIBLE_BECOME_ASK_PASS', False, boolean=True) -# Plugin paths +# PLUGINS +DEFAULT_SQUASH_ACTIONS = get_config(p, DEFAULTS, 'squash_actions', 'ANSIBLE_SQUASH_ACTIONS', "apt, yum, pkgng, zypper, dnf", islist=True) +# paths DEFAULT_ACTION_PLUGIN_PATH = get_config(p, DEFAULTS, 'action_plugins', 'ANSIBLE_ACTION_PLUGINS', '~/.ansible/plugins/action_plugins:/usr/share/ansible_plugins/action_plugins') DEFAULT_CACHE_PLUGIN_PATH = get_config(p, DEFAULTS, 'cache_plugins', 'ANSIBLE_CACHE_PLUGINS', '~/.ansible/plugins/cache_plugins:/usr/share/ansible_plugins/cache_plugins') DEFAULT_CALLBACK_PLUGIN_PATH = get_config(p, DEFAULTS, 'callback_plugins', 'ANSIBLE_CALLBACK_PLUGINS', '~/.ansible/plugins/callback_plugins:/usr/share/ansible_plugins/callback_plugins') @@ -187,7 +189,7 @@ DEFAULT_VARS_PLUGIN_PATH = get_config(p, DEFAULTS, 'vars_plugins', ' DEFAULT_FILTER_PLUGIN_PATH = get_config(p, DEFAULTS, 'filter_plugins', 'ANSIBLE_FILTER_PLUGINS', '~/.ansible/plugins/filter_plugins:/usr/share/ansible_plugins/filter_plugins') DEFAULT_TEST_PLUGIN_PATH = get_config(p, DEFAULTS, 'test_plugins', 'ANSIBLE_TEST_PLUGINS', '~/.ansible/plugins/test_plugins:/usr/share/ansible_plugins/test_plugins') DEFAULT_STDOUT_CALLBACK = get_config(p, DEFAULTS, 'stdout_callback', 'ANSIBLE_STDOUT_CALLBACK', 'default') - +# cache CACHE_PLUGIN = get_config(p, DEFAULTS, 'fact_caching', 'ANSIBLE_CACHE_PLUGIN', 'memory') CACHE_PLUGIN_CONNECTION = get_config(p, DEFAULTS, 'fact_caching_connection', 'ANSIBLE_CACHE_PLUGIN_CONNECTION', None) CACHE_PLUGIN_PREFIX = get_config(p, DEFAULTS, 'fact_caching_prefix', 'ANSIBLE_CACHE_PLUGIN_PREFIX', 'ansible_facts') @@ -217,6 +219,7 @@ ANSIBLE_SSH_PIPELINING = get_config(p, 'ssh_connection', 'pipelining', ' ANSIBLE_SSH_RETRIES = get_config(p, 'ssh_connection', 'retries', 'ANSIBLE_SSH_RETRIES', 0, integer=True) PARAMIKO_RECORD_HOST_KEYS = get_config(p, 'paramiko_connection', 'record_host_keys', 'ANSIBLE_PARAMIKO_RECORD_HOST_KEYS', True, boolean=True) + # obsolete -- will be formally removed ZEROMQ_PORT = get_config(p, 'fireball_connection', 'zeromq_port', 'ANSIBLE_ZEROMQ_PORT', 5099, integer=True) ACCELERATE_PORT = get_config(p, 'accelerate', 'accelerate_port', 'ACCELERATE_PORT', 5099, integer=True) diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py index 6b9dceaefb..4b372cf4c7 100644 --- a/lib/ansible/executor/task_executor.py +++ b/lib/ansible/executor/task_executor.py @@ -49,7 +49,7 @@ class TaskExecutor: # Modules that we optimize by squashing loop items into a single call to # the module - SQUASH_ACTIONS = frozenset(('apt', 'yum', 'pkgng', 'zypper', 'dnf')) + SQUASH_ACTIONS = frozenset(C.DEFAULT_SQUASH_ACTIONS) def __init__(self, host, task, job_vars, play_context, new_stdin, loader, shared_loader_obj): self._host = host |