diff options
| author | Matt Martz <matt@sivel.net> | 2018-08-20 16:26:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-20 16:26:10 -0500 |
| commit | 617372f8c0103c0f508f640bbb2f9f4a1fc85957 (patch) | |
| tree | c397f7dcfba2d564e585b8eb8f2fd55cda535b47 /lib/ansible/playbook/play.py | |
| parent | b7139782cfa7d631a204c38021e4ed59e9e5d956 (diff) | |
| download | ansible-617372f8c0103c0f508f640bbb2f9f4a1fc85957.tar.gz | |
Mass nuke deprecated items that are easily removed. ci_complete (#44320)
Diffstat (limited to 'lib/ansible/playbook/play.py')
| -rw-r--r-- | lib/ansible/playbook/play.py | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py index 0bcb2526b3..3457a2281f 100644 --- a/lib/ansible/playbook/play.py +++ b/lib/ansible/playbook/play.py @@ -59,7 +59,7 @@ class Play(Base, Taggable, Become): # Facts _fact_path = FieldAttribute(isa='string', default=None) _gather_facts = FieldAttribute(isa='bool', default=None, always_post_validate=True) - _gather_subset = FieldAttribute(isa='barelist', default=None, always_post_validate=True) + _gather_subset = FieldAttribute(isa='list', default=None, always_post_validate=True) _gather_timeout = FieldAttribute(isa='int', default=None, always_post_validate=True) # Variable Attributes @@ -203,18 +203,7 @@ class Play(Base, Taggable, Become): if new_ds is not None: for prompt_data in new_ds: if 'name' not in prompt_data: - display.deprecated("Using the 'short form' for vars_prompt has been deprecated", version="2.7") - for vname, prompt in prompt_data.items(): - vars_prompts.append(dict( - name=vname, - prompt=prompt, - default=None, - private=None, - confirm=None, - encrypt=None, - salt_size=None, - salt=None, - )) + raise AnsibleParserError("Invalid vars_prompt data structure", obj=ds) else: vars_prompts.append(prompt_data) return vars_prompts |