From 73aadfd49f80f4bc648e7f5992c762928cb7e996 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 7 Jun 2018 11:15:22 -0700
Subject: [PATCH] Apply up to date gerrit host key to zuul servers
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
---
manifests/site.pp | 6 +++++-
modules/openstack_project/manifests/zuul_merger.pp | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/manifests/site.pp b/manifests/site.pp
index d71b9adf29..a39470a41f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1285,7 +1285,7 @@ node /^ze\d+\.openstack\.org$/ {
}
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::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
bup::site { 'rax.ord':
backup_user => 'bup-zuulv3',
diff --git a/modules/openstack_project/manifests/zuul_merger.pp b/modules/openstack_project/manifests/zuul_merger.pp
index ec8333dc90..d8248eb8b1 100644
--- a/modules/openstack_project/manifests/zuul_merger.pp
+++ b/modules/openstack_project/manifests/zuul_merger.pp
@@ -18,7 +18,7 @@ class openstack_project::zuul_merger(
gearman_server => $gearman_server,
gerrit_server => $gerrit_server,
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_url => $zuul_url,
git_email => $git_email,