opendev
/
system-config
Code Issues Proposed changes

Add gerrit information to ze01.o.o 

Because zuul-executors do merging too, we need to populate both ssh
keys for gerrit and how to connect to gerrit.

Change-Id: Ifde6f01ab509495a373b77677883625e80d3b2ab
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-06-07 14:07:52 -04:00
parent f741500f92
commit 4316b825a7
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hiera/group/zuul-executor.yaml Normal file
View File

@ -0,0 +1,8 @@
---
zuul_connections:
- name: 'gerrit'
driver: 'gerrit'
server: 'review.openstack.org'
canonical_hostname: 'git.openstack.org'
user: 'zuul'
sshkey: '/var/lib/zuul/ssh/id_rsa'

25
manifests/site.pp
View File

@ -1092,12 +1092,13 @@ node /^nb\d+\.openstack\.org$/ {
node /^ze\d+\.openstack\.org$/ {
$group = "zuul-executor"
$gerrit_server = 'review.openstack.org'
$gerrit_user = 'zuul'
$zuul_ssh_private_key = hiera('zuul_ssh_private_key_contents')
$git_email = 'zuul@openstack.org'
$git_name = 'OpenStack Zuul'
$revision = 'feature/zuulv3'
$gerrit_server = 'review.openstack.org'
$gerrit_user = 'zuul'
$gerrit_ssh_private_key = hiera('gerrit_ssh_private_key_contents')
$zuul_ssh_private_key = hiera('zuul_ssh_private_key_contents')
$git_email = 'zuul@openstack.org'
$git_name = 'OpenStack Zuul'
$revision = 'feature/zuulv3'
class { 'openstack_project::server':
iptables_public_tcp_ports => [79],
@ -1110,10 +1111,10 @@ node /^ze\d+\.openstack\.org$/ {
gearman_server => 'zuulv3.openstack.org',
gerrit_server => $gerrit_server,
gerrit_user => $gerrit_user,
zuul_ssh_private_key => $zuul_ssh_private_key,
zuul_ssh_private_key => $gerrit_zuul_ssh_private_key,
git_email => $git_email,
git_name => $git_name,
worker_private_key_file => '/var/lib/zuul/ssh/id_rsa',
worker_private_key_file => '/var/lib/zuul/ssh/nodepool_id_rsa',
revision => $revision,
python_version => 3,
zookeeper_hosts => 'nodepool.openstack.org:2181',
@ -1121,6 +1122,14 @@ node /^ze\d+\.openstack\.org$/ {
}
class { '::zuul::executor': }
file { '/var/lib/zuul/ssh/nodepool_id_rsa':
owner => 'zuul',
group => 'zuul',
mode => '0400',
require => File['/var/lib/zuul/ssh'],
content => $zuul_ssh_private_key,
}
}
# Node-OS: trusty