From d6c5c1cd08c9096f82f9aff4cb976864b575163a Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Wed, 28 Mar 2018 17:48:04 -0400
Subject: [PATCH] Promote base-test to bast for ipv6 DNS fixes
This promotes https://review.openstack.org/557505/ to gather the
network ansible variables needed for configure-unbound role.
http://logs.openstack.org/67/549867/1/check/openstack-zuul-jobs-linters/60cb81c/job-output.txt.gz#_2018-03-28_21_43_26_651991
Change-Id: I68f5c3c7a1f2c582ac5f7b8b555b40e1cf4feb1a
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
playbooks/base-test/pre.yaml | 4 ++++
playbooks/base/pre.yaml | 9 +++++++++
2 files changed, 13 insertions(+)
diff --git a/playbooks/base-test/pre.yaml b/playbooks/base-test/pre.yaml
index a4c2470bc0..293fd091b2 100644
--- a/playbooks/base-test/pre.yaml
+++ b/playbooks/base-test/pre.yaml
@@ -5,6 +5,10 @@
- hosts: all
pre_tasks:
+ # NOTE(pabelanger): Until we hit the validate-host role, we have a minimal
+ # set of ansible variables collected by zuul-executor. This doesn't include
+ # network variables (ansible_default_ipv4 / ansible_default_ipv6) so gather
+ # these variables as they are important to the configure-unbound role.
- name: Gather network facts
setup:
gather_subset: 'network'
diff --git a/playbooks/base/pre.yaml b/playbooks/base/pre.yaml
index 3396b794af..293fd091b2 100644
--- a/playbooks/base/pre.yaml
+++ b/playbooks/base/pre.yaml
@@ -4,6 +4,15 @@
zuul_log_url: "http://logs.openstack.org"
- hosts: all
+ pre_tasks:
+ # NOTE(pabelanger): Until we hit the validate-host role, we have a minimal
+ # set of ansible variables collected by zuul-executor. This doesn't include
+ # network variables (ansible_default_ipv4 / ansible_default_ipv6) so gather
+ # these variables as they are important to the configure-unbound role.
+ - name: Gather network facts
+ setup:
+ gather_subset: 'network'
+
roles:
- add-build-sshkey
- start-zuul-console