diff options
| author | Gael Pasgrimaud <gael@gawel.org> | 2016-11-15 21:36:53 +0100 |
|---|---|---|
| committer | Brian Coca <bcoca@users.noreply.github.com> | 2016-11-15 15:36:53 -0500 |
| commit | f94100aa87ae4a86f0f9d68d6825aaa39408504f (patch) | |
| tree | 5c90f6189f459eab921592baec4bbc45479504c4 | |
| parent | bd70397e246e4a1d9d892964e5d66a452c08a676 (diff) | |
| download | ansible-f94100aa87ae4a86f0f9d68d6825aaa39408504f.tar.gz | |
make default strategy configurable (#18394)
| -rw-r--r-- | docsite/rst/intro_configuration.rst | 9 | ||||
| -rw-r--r-- | examples/ansible.cfg | 5 | ||||
| -rw-r--r-- | lib/ansible/constants.py | 1 | ||||
| -rw-r--r-- | lib/ansible/playbook/play.py | 3 |
4 files changed, 17 insertions, 1 deletions
diff --git a/docsite/rst/intro_configuration.rst b/docsite/rst/intro_configuration.rst index 38ab299aaa..4625770ce6 100644 --- a/docsite/rst/intro_configuration.rst +++ b/docsite/rst/intro_configuration.rst @@ -780,6 +780,15 @@ different locations:: Most users will not need to use this feature. See :doc:`developing_plugins` for more details +.. _cfg_strategy: + +strategy +======== + +Strategy allow to change the default strategy used by Ansible:: + + strategy = free + .. _sudo_exe: sudo_exe diff --git a/examples/ansible.cfg b/examples/ansible.cfg index 2a9f7cf725..7a21f7c0bf 100644 --- a/examples/ansible.cfg +++ b/examples/ansible.cfg @@ -182,6 +182,11 @@ #test_plugins = /usr/share/ansible/plugins/test #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 # /bin/ansible runs diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index 6da17352c4..2f77284d82 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -268,6 +268,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:/usr/share/ansible/plugins/filter', value_type='pathlist') DEFAULT_TEST_PLUGIN_PATH = get_config(p, DEFAULTS, 'test_plugins', 'ANSIBLE_TEST_PLUGINS', '~/.ansible/plugins/test:/usr/share/ansible/plugins/test', value_type='pathlist') DEFAULT_STRATEGY_PLUGIN_PATH = get_config(p, DEFAULTS, 'strategy_plugins', 'ANSIBLE_STRATEGY_PLUGINS', '~/.ansible/plugins/strategy:/usr/share/ansible/plugins/strategy', value_type='pathlist') +DEFAULT_STRATEGY = get_config(p, DEFAULTS, 'strategy', 'ANSIBLE_STRATEGY', 'linear') 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') diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py index e3d430f17f..c45a7e8041 100644 --- a/lib/ansible/playbook/play.py +++ b/lib/ansible/playbook/play.py @@ -20,6 +20,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type from ansible.compat.six import string_types +from ansible import constants as C from ansible.errors import AnsibleParserError @@ -88,7 +89,7 @@ class Play(Base, Taggable, Become): _force_handlers = FieldAttribute(isa='bool', always_post_validate=True) _max_fail_percentage = FieldAttribute(isa='percent', always_post_validate=True) _serial = FieldAttribute(isa='list', default=[], always_post_validate=True) - _strategy = FieldAttribute(isa='string', default='linear', always_post_validate=True) + _strategy = FieldAttribute(isa='string', default=C.DEFAULT_STRATEGY, always_post_validate=True) # ================================================================================= |