From b414184b48767f746b2bd935430e3b89a0df70b7 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 10 Jul 2017 07:24:33 -0500 Subject: [PATCH] Use the validate-host role instead of the openstack-info role The new role has been reworked and is also not openstack specific but rather allows us to pass in openstack specific things. Change-Id: I6daa045d3f2ccb1540d64e81f7fc825eed08b2d4 --- playbooks/base/pre.yaml | 5 ++++- zuul.yaml | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/playbooks/base/pre.yaml b/playbooks/base/pre.yaml index dc68b97755..6d55b453bd 100644 --- a/playbooks/base/pre.yaml +++ b/playbooks/base/pre.yaml @@ -1,4 +1,7 @@ - hosts: all roles: - 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 diff --git a/zuul.yaml b/zuul.yaml index ec61720671..971dacc833 100644 --- a/zuul.yaml +++ b/zuul.yaml @@ -30,6 +30,9 @@ post-run: playbooks/base/post 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