Remove implied playbook extensions

We deprecated this a while ago, and most changes to OpenStack
projects implementing the change have landed.

Change-Id: Ie2519f2b4144761b8e4d17ec3299cf4238e16f08
This commit is contained in:
James E. Blair 2017-12-04 07:44:10 -08:00 committed by Ian Wienand
parent 548c43c265
commit 811cfafbdd
2 changed files with 5 additions and 28 deletions

View File

@ -798,13 +798,6 @@ Here is an example of two job definitions:
are run after the parent's. See :ref:`job` for more are run after the parent's. See :ref:`job` for more
information. information.
.. warning::
If the path as specified does not exist, Zuul will try
appending the extensions ``.yaml`` and ``.yml``. This
behavior is deprecated and will be removed in the future all
playbook paths should include the file extension.
.. attr:: post-run .. attr:: post-run
The name of a playbook or list of playbooks to run after the The name of a playbook or list of playbooks to run after the
@ -815,13 +808,6 @@ Here is an example of two job definitions:
playbooks are run before the parent's. See :ref:`job` for more playbooks are run before the parent's. See :ref:`job` for more
information. information.
.. warning::
If the path as specified does not exist, Zuul will try
appending the extensions ``.yaml`` and ``.yml``. This
behavior is deprecated and will be removed in the future all
playbook paths should include the file extension.
.. attr:: run .. attr:: run
The name of the main playbook for this job. If it is not The name of the main playbook for this job. If it is not
@ -833,13 +819,6 @@ Here is an example of two job definitions:
run: playbooks/job-playbook.yaml run: playbooks/job-playbook.yaml
.. warning::
If the path as specified does not exist, Zuul will try
appending the extensions ``.yaml`` and ``.yml``. This
behavior is deprecated and will be removed in the future all
playbook paths should include the file extension.
.. attr:: roles .. attr:: roles
A list of Ansible roles to prepare for the job. Because a job A list of Ansible roles to prepare for the job. Because a job

View File

@ -958,13 +958,11 @@ class AnsibleJob(object):
"non-trusted repo." % (entry, path)) "non-trusted repo." % (entry, path))
def findPlaybook(self, path, trusted=False): def findPlaybook(self, path, trusted=False):
for ext in ['', '.yaml', '.yml']: if os.path.exists(path):
fn = path + ext if not trusted:
if os.path.exists(fn): playbook_dir = os.path.dirname(os.path.abspath(path))
if not trusted: self._blockPluginDirs(playbook_dir)
playbook_dir = os.path.dirname(os.path.abspath(fn)) return path
self._blockPluginDirs(playbook_dir)
return fn
raise ExecutorError("Unable to find playbook %s" % path) raise ExecutorError("Unable to find playbook %s" % path)
def preparePlaybooks(self, args): def preparePlaybooks(self, args):