opendev/system-config
Code Issues Proposed changes

Apply up to date gerrit host key to zuul servers

Browse Source 
Apply the review.o.o ssh rsa host key to all of our active zuul servers.
Update the ip addresses in that host key entry to reflect the current
server's IP addrs too.

Change-Id: I147ff0b9547f2cee36d7c56c8f5352ece8a4ec82
This commit is contained in:
Clark Boylan 2018-06-07 11:15:22 -07:00
parent 8304b9626c
commit 73aadfd49f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/site.pp
View File

@ -1285,7 +1285,7 @@ node /^ze\d+\.openstack\.org$/ {
} }
class { '::zuul::known_hosts': class { '::zuul::known_hosts':
known_hosts_content => "review.openstack.org,104.130.246.91,2001:4800:7819:103:be76:4eff:fe05:8525 ${gerrit_ssh_host_key}", known_hosts_content => "review.openstack.org,104.130.246.32,2001:4800:7819:103:be76:4eff:fe04:9229 ${gerrit_ssh_host_key}",
} }
} }
@ -1387,6 +1387,10 @@ node /^zuul\d+\.openstack\.org$/ {
class { '::zuul::fingergw': } class { '::zuul::fingergw': }
class { '::zuul::known_hosts':
known_hosts_content => "review.openstack.org,104.130.246.32,2001:4800:7819:103:be76:4eff:fe04:9229 ${gerrit_ssh_host_key}",
}
include bup include bup
bup::site { 'rax.ord': bup::site { 'rax.ord':
backup_user => 'bup-zuulv3', backup_user => 'bup-zuulv3',

2
modules/openstack_project/manifests/zuul_merger.pp
View File

@ -18,7 +18,7 @@ class openstack_project::zuul_merger(
gearman_server => $gearman_server, gearman_server => $gearman_server,
gerrit_server => $gerrit_server, gerrit_server => $gerrit_server,
gerrit_user => $gerrit_user, gerrit_user => $gerrit_user,
known_hosts_content => "review.openstack.org,23.253.232.87,2001:4800:7815:104:3bc3:d7f6:ff03:bf5d ${gerrit_ssh_host_key}", known_hosts_content => "review.openstack.org,104.130.246.32,2001:4800:7819:103:be76:4eff:fe04:9229 ${gerrit_ssh_host_key}",
zuul_ssh_private_key => $zuul_ssh_private_key, zuul_ssh_private_key => $zuul_ssh_private_key,
zuul_url => $zuul_url, zuul_url => $zuul_url,
git_email => $git_email, git_email => $git_email,