opendev
/
system-config
Code Issues Proposed changes

Set worker_private_key_file for zuul-executor 

We use zuul::init to install our ssh keys for zuul workers, now we
need to update zuul.conf to use it.

Change-Id: I0a3fe1a79c8db3fd59b093bccac15b5f2bf0e278
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-06-06 15:19:44 -04:00
parent 82edda9c81
commit dcc75fd782
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/site.pp
View File

@ -1107,15 +1107,16 @@ node /^ze\d+\.openstack\.org$/ {
# NOTE(pabelanger): We call ::zuul directly, so we can override all in one
# settings.
class { '::zuul':
gerrit_server => $gerrit_server,
gerrit_user => $gerrit_user,
zuul_ssh_private_key => $zuul_ssh_private_key,
git_email => $git_email,
git_name => $git_name,
revision => $revision,
python_version => 3,
zookeeper_hosts => 'nodepool.openstack.org:2181',
zuulv3 => true,
gerrit_server => $gerrit_server,
gerrit_user => $gerrit_user,
zuul_ssh_private_key => $zuul_ssh_private_key,
git_email => $git_email,
git_name => $git_name,
worker_private_key_file => '/var/lib/zuul/ssh/id_rsa',
revision => $revision,
python_version => 3,
zookeeper_hosts => 'nodepool.openstack.org:2181',
zuulv3 => true,
}
class { '::zuul::executor': }