diff options
author | Martin Krizek <martin.krizek@gmail.com> | 2022-03-31 21:13:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-01 05:13:28 +1000 |
commit | 26149c45dfb8ad651301a913ad3196b9efc419dd (patch) | |
tree | 7f267a7cab5e4f1eb571da1f68022532cb92744e /lib/ansible/playbook/playbook_include.py | |
parent | eeef3110b2a3e054f8698c48fda134480c3bf481 (diff) | |
download | ansible-26149c45dfb8ad651301a913ad3196b9efc419dd.tar.gz |
import_playbook: remove deprecated free form params (#77431)
Diffstat (limited to 'lib/ansible/playbook/playbook_include.py')
-rw-r--r-- | lib/ansible/playbook/playbook_include.py | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/lib/ansible/playbook/playbook_include.py b/lib/ansible/playbook/playbook_include.py index 91bcf5163a..33908069e3 100644 --- a/lib/ansible/playbook/playbook_include.py +++ b/lib/ansible/playbook/playbook_include.py @@ -158,7 +158,6 @@ class PlaybookInclude(Base, Conditional, Taggable): ''' Splits the playbook import line up into filename and parameters ''' - if v is None: raise AnsibleParserError("playbook import parameter is missing", obj=ds) elif not isinstance(v, string_types): @@ -169,16 +168,5 @@ class PlaybookInclude(Base, Conditional, Taggable): items = split_args(v) if len(items) == 0: raise AnsibleParserError("import_playbook statements must specify the file name to import", obj=ds) - else: - new_ds['import_playbook'] = items[0].strip() - if len(items) > 1: - display.deprecated("Additional parameters in import_playbook statements are deprecated. " - "Use 'vars' instead. See 'import_playbook' documentation for examples.", version='2.14') - # rejoin the parameter portion of the arguments and - # then use parse_kv() to get a dict of params back - params = parse_kv(" ".join(items[1:])) - if 'tags' in params: - new_ds['tags'] = params.pop('tags') - if 'vars' in new_ds: - raise AnsibleParserError("import_playbook parameters cannot be mixed with 'vars' entries for import statements", obj=ds) - new_ds['vars'] = params + + new_ds['import_playbook'] = items[0].strip() |