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 <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-06-02 12:30:59 -04:00
parent fff939e64d
commit 52cf25c53c
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
2 changed files with 18 additions and 0 deletions

View File

@ -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'

View File

@ -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':