diff options
| author | James Cammarata <jimi@sngx.net> | 2015-10-27 14:46:42 -0400 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2015-10-27 14:46:42 -0400 |
| commit | 1dc23ea779dee8ed70fbcfc54e44bf98eecde7fa (patch) | |
| tree | 02767b884e9adddfcc1c90715a891c48949a8050 | |
| parent | cace91df5684aea6703fa41da5d9b8cc58893b5c (diff) | |
| parent | d861e7dd5dbdf9f95f3e3cf03801843a19039108 (diff) | |
| download | ansible-1dc23ea779dee8ed70fbcfc54e44bf98eecde7fa.tar.gz | |
Merge pull request #12866 from bcoca/more_inheritence
More inheritence
| -rw-r--r-- | lib/ansible/playbook/base.py | 3 | ||||
| -rw-r--r-- | lib/ansible/playbook/task.py | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/ansible/playbook/base.py b/lib/ansible/playbook/base.py index 39ae27b7be..e8759c32a2 100644 --- a/lib/ansible/playbook/base.py +++ b/lib/ansible/playbook/base.py @@ -54,6 +54,9 @@ class Base: # flags and misc. settings _environment = FieldAttribute(isa='list') _no_log = FieldAttribute(isa='bool') + _always_run = FieldAttribute(isa='bool') + _run_once = FieldAttribute(isa='bool') + _ignore_errors = FieldAttribute(isa='bool') # param names which have been deprecated/removed DEPRECATED_ATTRIBUTES = [ diff --git a/lib/ansible/playbook/task.py b/lib/ansible/playbook/task.py index 3527cee46a..a58e634171 100644 --- a/lib/ansible/playbook/task.py +++ b/lib/ansible/playbook/task.py @@ -68,7 +68,6 @@ class Task(Base, Conditional, Taggable, Become): _args = FieldAttribute(isa='dict', default=dict()) _action = FieldAttribute(isa='string') - _always_run = FieldAttribute(isa='bool') _any_errors_fatal = FieldAttribute(isa='bool') _async = FieldAttribute(isa='int', default=0) _changed_when = FieldAttribute(isa='string') @@ -76,7 +75,6 @@ class Task(Base, Conditional, Taggable, Become): _delegate_to = FieldAttribute(isa='string') _failed_when = FieldAttribute(isa='string') _first_available_file = FieldAttribute(isa='list') - _ignore_errors = FieldAttribute(isa='bool') _loop = FieldAttribute(isa='string', private=True) _loop_args = FieldAttribute(isa='list', private=True) _name = FieldAttribute(isa='string', default='') @@ -84,7 +82,6 @@ class Task(Base, Conditional, Taggable, Become): _poll = FieldAttribute(isa='int') _register = FieldAttribute(isa='string') _retries = FieldAttribute(isa='int', default=1) - _run_once = FieldAttribute(isa='bool') _until = FieldAttribute(isa='list') # ? def __init__(self, block=None, role=None, task_include=None): |