From d861e7dd5dbdf9f95f3e3cf03801843a19039108 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Thu, 22 Oct 2015 07:47:58 -0400 Subject: [PATCH] moved several directives so they are not settable at play, block, role and task levels --- lib/ansible/playbook/base.py | 3 +++ 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 b4b34bd9df..e8f4859b0b 100644 --- a/lib/ansible/playbook/base.py +++ b/lib/ansible/playbook/base.py @@ -53,6 +53,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):