ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

allow pesky 'bridge' facts to bypass facts filter (#28401)

Browse source 
* allow pesky 'bridge' facts to bypass facts filter

fixes #27729, #23577

* I ate pepe
This commit is contained in:
Brian Coca 2017-08-29 09:47:40 -04:00 committed by GitHub
parent 40907d7db2
commit c06f8a3f9b
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/ansible/playbook/task.py
View file

@ -25,7 +25,7 @@ from ansible.errors import AnsibleError, AnsibleParserError, AnsibleUndefinedVar
from ansible.module_utils.six import iteritems, string_types from ansible.module_utils.six import iteritems, string_types
from ansible.module_utils._text import to_native from ansible.module_utils._text import to_native
from ansible.parsing.mod_args import ModuleArgsParser from ansible.parsing.mod_args import ModuleArgsParser
from ansible.parsing.yaml.objects import AnsibleBaseYAMLObject, AnsibleMapping, AnsibleUnicode from ansible.parsing.yaml.objects import AnsibleBaseYAMLObject, AnsibleMapping
from ansible.plugins.loader import lookup_loader from ansible.plugins.loader import lookup_loader
from ansible.playbook.attribute import FieldAttribute from ansible.playbook.attribute import FieldAttribute
from ansible.playbook.base import Base from ansible.playbook.base import Base
@ -205,23 +205,24 @@ class Task(Base, Conditional, Taggable, Become):
for (k, v) in iteritems(ds): for (k, v) in iteritems(ds):
if k in ('action', 'local_action', 'args', 'delegate_to') or k == action or k == 'shell': if k in ('action', 'local_action', 'args', 'delegate_to') or k == action or k == 'shell':
# we don't want to re-assign these values, which were # we don't want to re-assign these values, which were determined by the ModuleArgsParser() above
# determined by the ModuleArgsParser() above
continue continue
elif k.replace("with_", "") in lookup_loader: elif k.replace("with_", "") in lookup_loader:
# transform into loop property
self._preprocess_loop(ds, new_ds, k, v) self._preprocess_loop(ds, new_ds, k, v)
else: else:
# pre-2.0 syntax allowed variables for include statements at the # pre-2.0 syntax allowed variables for include statements at the top level of the task,
# top level of the task, so we move those into the 'vars' dictionary # so we move those into the 'vars' dictionary here, and show a deprecation message
# here, and show a deprecation message as we will remove this at # as we will remove this at some point in the future.
# some point in the future.
if action in ('include', 'include_tasks') and k not in self._valid_attrs and k not in self.DEPRECATED_ATTRIBUTES: if action in ('include', 'include_tasks') and k not in self._valid_attrs and k not in self.DEPRECATED_ATTRIBUTES:
display.deprecated("Specifying include variables at the top-level of the task is deprecated." display.deprecated("Specifying include variables at the top-level of the task is deprecated."
" Please see:\nhttp://docs.ansible.com/ansible/playbooks_roles.html#task-include-files-and-encouraging-reuse\n\n" " Please see:\nhttp://docs.ansible.com/ansible/playbooks_roles.html#task-include-files-and-encouraging-reuse\n\n"
" for currently supported syntax regarding included files and variables", version="2.7") " for currently supported syntax regarding included files and variables", version="2.7")
new_ds['vars'][k] = v new_ds['vars'][k] = v
else: elif k in self._valid_attrs:
new_ds[k] = v new_ds[k] = v
else:
display.warning("Ignoring invalid attribute: %s" % k)
return super(Task, self).preprocess_data(new_ds) return super(Task, self).preprocess_data(new_ds)

3
lib/ansible/plugins/action/__init__.py
View file

@ -780,7 +780,8 @@ class ActionBase(with_metaclass(ABCMeta, object)):
conn_name = os.path.splitext(os.path.basename(conn_path))[0] conn_name = os.path.splitext(os.path.basename(conn_path))[0]
re_key = re.compile('^ansible_%s_' % conn_name) re_key = re.compile('^ansible_%s_' % conn_name)
for fact_key in fact_keys: for fact_key in fact_keys:
if re_key.match(fact_key): # exception for lvm tech, whic normally returns asnible_x_bridge facts that get filterd out (docker,lxc, etc)
if re_key.match(fact_key) and not fact_key.endswith(('_bridge', '_gwbridge')):
remove_keys.add(fact_key) remove_keys.add(fact_key)
except AttributeError: except AttributeError:
pass pass