From f52ca2fe5fe16ab6e3b14237c5ccaaf9a5de64b0 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Mon, 23 Nov 2020 18:11:13 +0000 Subject: [PATCH] Add known_hosts entries for additional Gerrit keys Gerrit has shuffled the order in which it returns host keys, and ssh clients can get confused if the first host key type they support in the list isn't included in the known_hosts file already. Just go ahead and include all the host keys our Gerrit provides. Change-Id: I15cdf24d9b3a372a7c8ad1aef97baa3b5eeefab0 --- zuul.d/secrets.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/zuul.d/secrets.yaml b/zuul.d/secrets.yaml index 370699d891..5177c17f74 100644 --- a/zuul.d/secrets.yaml +++ b/zuul.d/secrets.yaml @@ -423,7 +423,9 @@ data: fqdn: review.opendev.org ssh_known_hosts: | - review.opendev.org,104.130.246.91,2001:4800:7819:103:be76:4eff:fe05:8525 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfsIj/jqpI+2CFdjCL6kOiqdORWvxQ2sQbCzSzzmLXic8yVhCCbwarkvEpfUOHG4eyB0vqVZfMffxf0Yy3qjURrsroBCiuJ8GdiAcGdfYwHNfBI0cR6kydBZL537YDasIk0Z3ILzhwf7474LmkVzS7V2tMTb4ZiBS/jUeiHsVp88FZhIBkyhlb/awAGcUxT5U4QBXCAmerYXeB47FPuz9JFOVyF08LzH9JRe9tfXtqaCNhlSdRe/2pPRvn2EIhn5uHWwATACG9MBdrK8xv8LqPOik2w1JkgLWyBj11vDd5I3IjrmREGw8dqImqp0r6MD8rxqADlc1elfDIXYsy+TVH proposal-bot@review.opendev.org + review.opendev.org,104.130.246.91,2001:4800:7819:103:be76:4eff:fe05:8525 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfsIj/jqpI+2CFdjCL6kOiqdORWvxQ2sQbCzSzzmLXic8yVhCCbwarkvEpfUOHG4eyB0vqVZfMffxf0Yy3qjURrsroBCiuJ8GdiAcGdfYwHNfBI0cR6kydBZL537YDasIk0Z3ILzhwf7474LmkVzS7V2tMTb4ZiBS/jUeiHsVp88FZhIBkyhlb/awAGcUxT5U4QBXCAmerYXeB47FPuz9JFOVyF08LzH9JRe9tfXtqaCNhlSdRe/2pPRvn2EIhn5uHWwATACG9MBdrK8xv8LqPOik2w1JkgLWyBj11vDd5I3IjrmREGw8dqImqp0r6MD8rxqADlc1elfDIXYsy+TVH + review.opendev.org,104.130.246.91,2001:4800:7819:103:be76:4eff:fe05:8525 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIncSZ8k+c0YJTO6Wux/Kpu2jnktFkepoU3jBkbIzXve + review.opendev.org,104.130.246.91,2001:4800:7819:103:be76:4eff:fe05:8525 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBD70+y/Y7dJQBNboK6k+hq0DEGgFRzW0GRRVneYZHZ0fJMTeEDU04HziYky8fhV4eJWeqQmh3pbdPJHoqDWIGEA= ssh_private_key: !encrypted/pkcs1-oaep - qQ5lf3x+5zuYMR11WTfYZ2HsDgyTW0vd6Ug/lT6vf6mEM5D/CFwqnMMN0leOFFSzNgTgz 0Wi9n7w4IenmqFkKBJtFNfJByZ+9no90d1E0Z7P5N4BoOzj9cmB9KGLYDf050ODV0I6AH @@ -523,7 +525,9 @@ data: fqdn: review.opendev.org ssh_known_hosts: | - review.opendev.org,104.130.246.91,2001:4800:7819:103:be76:4eff:fe05:8525 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfsIj/jqpI+2CFdjCL6kOiqdORWvxQ2sQbCzSzzmLXic8yVhCCbwarkvEpfUOHG4eyB0vqVZfMffxf0Yy3qjURrsroBCiuJ8GdiAcGdfYwHNfBI0cR6kydBZL537YDasIk0Z3ILzhwf7474LmkVzS7V2tMTb4ZiBS/jUeiHsVp88FZhIBkyhlb/awAGcUxT5U4QBXCAmerYXeB47FPuz9JFOVyF08LzH9JRe9tfXtqaCNhlSdRe/2pPRvn2EIhn5uHWwATACG9MBdrK8xv8LqPOik2w1JkgLWyBj11vDd5I3IjrmREGw8dqImqp0r6MD8rxqADlc1elfDIXYsy+TVH release@review.opendev.org + review.opendev.org,104.130.246.91,2001:4800:7819:103:be76:4eff:fe05:8525 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfsIj/jqpI+2CFdjCL6kOiqdORWvxQ2sQbCzSzzmLXic8yVhCCbwarkvEpfUOHG4eyB0vqVZfMffxf0Yy3qjURrsroBCiuJ8GdiAcGdfYwHNfBI0cR6kydBZL537YDasIk0Z3ILzhwf7474LmkVzS7V2tMTb4ZiBS/jUeiHsVp88FZhIBkyhlb/awAGcUxT5U4QBXCAmerYXeB47FPuz9JFOVyF08LzH9JRe9tfXtqaCNhlSdRe/2pPRvn2EIhn5uHWwATACG9MBdrK8xv8LqPOik2w1JkgLWyBj11vDd5I3IjrmREGw8dqImqp0r6MD8rxqADlc1elfDIXYsy+TVH + review.opendev.org,104.130.246.91,2001:4800:7819:103:be76:4eff:fe05:8525 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIncSZ8k+c0YJTO6Wux/Kpu2jnktFkepoU3jBkbIzXve + review.opendev.org,104.130.246.91,2001:4800:7819:103:be76:4eff:fe05:8525 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBD70+y/Y7dJQBNboK6k+hq0DEGgFRzW0GRRVneYZHZ0fJMTeEDU04HziYky8fhV4eJWeqQmh3pbdPJHoqDWIGEA= ssh_private_key: !encrypted/pkcs1-oaep - x1+fTO5A9nI+9ZzmPkcnhdGjUl831xromQ8r/j5/boiWmfQ2Cw3NGD6B+KosOmWXmF8f/ kzVz7+/D2cBwNlBci4mrLvJHqYMaHUVCq32ciokJaC3vgEuX6qyb4UDYaCNdHMxVK7wFB