cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #12866 from bcoca/more_inheritence

Browse source 
More inheritence
This commit is contained in:
James Cammarata 2015-10-27 14:46:42 -04:00
commit 1dc23ea779
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/playbook/base.py
View file

@ -54,6 +54,9 @@ class Base:
# flags and misc. settings # flags and misc. settings
_environment = FieldAttribute(isa='list') _environment = FieldAttribute(isa='list')
_no_log = FieldAttribute(isa='bool') _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 # param names which have been deprecated/removed
DEPRECATED_ATTRIBUTES = [ DEPRECATED_ATTRIBUTES = [

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

@ -68,7 +68,6 @@ class Task(Base, Conditional, Taggable, Become):
_args = FieldAttribute(isa='dict', default=dict()) _args = FieldAttribute(isa='dict', default=dict())
_action = FieldAttribute(isa='string') _action = FieldAttribute(isa='string')
_always_run = FieldAttribute(isa='bool')
_any_errors_fatal = FieldAttribute(isa='bool') _any_errors_fatal = FieldAttribute(isa='bool')
_async = FieldAttribute(isa='int', default=0) _async = FieldAttribute(isa='int', default=0)
_changed_when = FieldAttribute(isa='string') _changed_when = FieldAttribute(isa='string')
@ -76,7 +75,6 @@ class Task(Base, Conditional, Taggable, Become):
_delegate_to = FieldAttribute(isa='string') _delegate_to = FieldAttribute(isa='string')
_failed_when = FieldAttribute(isa='string') _failed_when = FieldAttribute(isa='string')
_first_available_file = FieldAttribute(isa='list') _first_available_file = FieldAttribute(isa='list')
_ignore_errors = FieldAttribute(isa='bool')
_loop = FieldAttribute(isa='string', private=True) _loop = FieldAttribute(isa='string', private=True)
_loop_args = FieldAttribute(isa='list', private=True) _loop_args = FieldAttribute(isa='list', private=True)
_name = FieldAttribute(isa='string', default='') _name = FieldAttribute(isa='string', default='')
@ -84,7 +82,6 @@ class Task(Base, Conditional, Taggable, Become):
_poll = FieldAttribute(isa='int') _poll = FieldAttribute(isa='int')
_register = FieldAttribute(isa='string') _register = FieldAttribute(isa='string')
_retries = FieldAttribute(isa='int', default=1) _retries = FieldAttribute(isa='int', default=1)
_run_once = FieldAttribute(isa='bool')
_until = FieldAttribute(isa='list') # ? _until = FieldAttribute(isa='list') # ?
def __init__(self, block=None, role=None, task_include=None): def __init__(self, block=None, role=None, task_include=None):