From 52cf25c53cc4c111de8b8489c75cd9f5a933c874 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Fri, 2 Jun 2017 12:30:59 -0400 Subject: [PATCH] Use zuulv3 syntax for configuration Update zuulv3.o.o to use proper configuration files / syntax. Add zuul_connection to public hiera yaml. Also default zuul_connections to a list, to ensure our testing passes properly. Change-Id: I73fd119f41be029fe969596b781918309642b557 Depends-On: I6d0ec2ef2d1b0c86fdcd06bfca01c02a6fffa7f3 Signed-off-by: Paul Belanger --- hiera/fqdn/zuulv3.openstack.org.yaml | 15 +++++++++++++++ manifests/site.pp | 3 +++ 2 files changed, 18 insertions(+) create mode 100644 hiera/fqdn/zuulv3.openstack.org.yaml diff --git a/hiera/fqdn/zuulv3.openstack.org.yaml b/hiera/fqdn/zuulv3.openstack.org.yaml new file mode 100644 index 0000000000..074e018045 --- /dev/null +++ b/hiera/fqdn/zuulv3.openstack.org.yaml @@ -0,0 +1,15 @@ +--- +zuul_connections: + - name: 'smtp' + driver: 'smtp' + server: 'localhost' + port: '25' + default_from: 'zuul@zuulv3.openstack.org' + default_to: 'zuul.reports@zuulv3.openstack.org' + + - name: 'gerrit' + driver: 'gerrit' + server: 'review.openstack.org' + canonical_hostname: 'git.openstack.org' + user: 'zuul' + sshkey: '/var/lib/zuul/ssh/id_rsa' diff --git a/manifests/site.pp b/manifests/site.pp index f4e9bb0c5c..f2cb129b11 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1162,6 +1162,9 @@ node 'zuulv3.openstack.org' { git_name => $git_name, revision => $revision, python_version => 3, + zookeeper_hosts => 'nodepool.openstack.org:2181', + zuulv3 => true, + connections => hiera('zuul_connections', []), } class { '::zuul::scheduler':