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

allow empty plays again, for now (#55878)

Browse source
This commit is contained in:
Brian Coca 2019-04-29 17:59:10 -04:00 committed by GitHub
parent cb0ca89994
commit 815a375177
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/bad_empty_play.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- re allow empty plays for now, but add deprecation msg.

4
lib/ansible/playbook/__init__.py
View file

@ -69,12 +69,14 @@ class Playbook:
raise AnsibleParserError("Could not read playbook (%s) due to encoding issues: %s" % (file_name, to_native(e))) raise AnsibleParserError("Could not read playbook (%s) due to encoding issues: %s" % (file_name, to_native(e)))
# check for errors and restore the basedir in case this error is caught and handled # check for errors and restore the basedir in case this error is caught and handled
if not ds: if ds is None:
self._loader.set_basedir(cur_basedir) self._loader.set_basedir(cur_basedir)
raise AnsibleParserError("Empty playbook, nothing to do", obj=ds) raise AnsibleParserError("Empty playbook, nothing to do", obj=ds)
elif not isinstance(ds, list): elif not isinstance(ds, list):
self._loader.set_basedir(cur_basedir) self._loader.set_basedir(cur_basedir)
raise AnsibleParserError("A playbook must be a list of plays, got a %s instead" % type(ds), obj=ds) raise AnsibleParserError("A playbook must be a list of plays, got a %s instead" % type(ds), obj=ds)
elif not ds:
display.deprecated("Empty plays will currently be skipped, in the future they will cause a syntax error", version='2.12')
# Parse the playbook entries. For plays, we simply parse them # Parse the playbook entries. For plays, we simply parse them
# using the Play() object, and includes are parsed using the # using the Play() object, and includes are parsed using the