opendev/system-config
Code Issues Proposed changes

Merge "Add gerrit information to ze01.o.o"

Browse Source
This commit is contained in:
Jenkins 2017-06-08 14:00:00 +00:00 committed by Gerrit Code Review
commit d99c60a016
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'

13
manifests/site.pp
View File

@ -1094,6 +1094,7 @@ node /^ze\d+\.openstack\.org$/ {
$gerrit_server = 'review.openstack.org' $gerrit_server = 'review.openstack.org'
$gerrit_user = 'zuul' $gerrit_user = 'zuul'
$gerrit_ssh_private_key = hiera('gerrit_ssh_private_key_contents')
$zuul_ssh_private_key = hiera('zuul_ssh_private_key_contents') $zuul_ssh_private_key = hiera('zuul_ssh_private_key_contents')
$git_email = 'zuul@openstack.org' $git_email = 'zuul@openstack.org'
$git_name = 'OpenStack Zuul' $git_name = 'OpenStack Zuul'
@ -1110,10 +1111,10 @@ node /^ze\d+\.openstack\.org$/ {
gearman_server => 'zuulv3.openstack.org', gearman_server => 'zuulv3.openstack.org',
gerrit_server => $gerrit_server, gerrit_server => $gerrit_server,
gerrit_user => $gerrit_user, 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_email => $git_email,
git_name => $git_name, 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, revision => $revision,
python_version => 3, python_version => 3,
zookeeper_hosts => 'nodepool.openstack.org:2181', zookeeper_hosts => 'nodepool.openstack.org:2181',
@ -1121,6 +1122,14 @@ node /^ze\d+\.openstack\.org$/ {
} }
class { '::zuul::executor': } 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 # Node-OS: trusty