From 4316b825a76b3d2e0ef0c6387f0169684b2b1997 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 7 Jun 2017 14:07:52 -0400 Subject: [PATCH] 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 --- hiera/group/zuul-executor.yaml | 8 ++++++++ manifests/site.pp | 25 +++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 hiera/group/zuul-executor.yaml diff --git a/hiera/group/zuul-executor.yaml b/hiera/group/zuul-executor.yaml new file mode 100644 index 0000000000..dddd25b766 --- /dev/null +++ b/hiera/group/zuul-executor.yaml @@ -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' diff --git a/manifests/site.pp b/manifests/site.pp index 52d2fd69e2..f3b89e54f3 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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