Merge "Use the validate-host role instead of the openstack-info role"

playbooks/base/pre.yaml

@@ -2,4 +2,7 @@
   roles:
     - add-build-sshkey
     - prepare-workspace
-    - openstack-info
+    - role: validate-host
+      # TODO(mordred) When we have site-local variables, these should go there
+      zuul_traceroute_host: git.openstack.org
+      zuul_image_manifest: /etc/dib-builddate.txt

zuul.yaml

@@ -32,6 +32,9 @@
       - playbooks/base/post-logs
     roles:
       - zuul: openstack-infra/openstack-zuul-roles
+      # TODO(mordred): Once base job in project-config is an override of
+      # base job in zuul-jobs, we will not need this line.
+      - zuul: openstack-infra/zuul-jobs
     # TODO(jeblair): This will only work for our current 6 digit
     # change numbers.  We have a plan to do the formatting in the log
     # publishing playbook and pass the information back to zuul.  That