Merge "Remove zuul._projects"
diff --git a/doc/source/user/jobs.rst b/doc/source/user/jobs.rst
index 9ec4646..820e316 100644
--- a/doc/source/user/jobs.rst
+++ b/doc/source/user/jobs.rst
@@ -281,14 +281,6 @@
msg: "Project {{ item.name }} is at {{ item.src_dir }}
with_items: {{ zuul.projects.values() | list }}
-
- .. var:: _projects
- :type: dict
-
- The same as ``projects`` but a dictionary indexed by the
- ``name`` value of each entry. ``projects`` will be converted to
- this.
-
.. var:: tenant
The name of the current Zuul tenant.
diff --git a/zuul/executor/client.py b/zuul/executor/client.py
index b21a290..d561232 100644
--- a/zuul/executor/client.py
+++ b/zuul/executor/client.py
@@ -262,12 +262,6 @@
src_dir=os.path.join('src', p.canonical_name),
required=(p in required_projects),
))
- # We are transitioning "projects" from a list to a dict
- # indexed by canonical name, as it is much easier to access
- # values in ansible. Existing callers have been converted to
- # "_projects" and "projects" is swapped; we will convert users
- # back to "projects" and remove this soon.
- zuul_params['_projects'] = zuul_params['projects']
build = Build(job, uuid)
build.parameters = params
diff --git a/zuul/executor/server.py b/zuul/executor/server.py
index a8ab8c4..03a3a12 100644
--- a/zuul/executor/server.py
+++ b/zuul/executor/server.py
@@ -713,7 +713,7 @@
project['default_branch'])
# Update the inventory variables to indicate the ref we
# checked out
- p = args['zuul']['_projects'][project['canonical_name']]
+ p = args['zuul']['projects'][project['canonical_name']]
p['checkout'] = selected
# Delete the origin remote from each repo we set up since
# it will not be valid within the jobs.