From 9d8929af1efede64fa11a229c3c71dc28870350d Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Mon, 18 Jul 2011 11:54:41 -0700 Subject: [PATCH] Add gerrit dev/prod servers to jenkins slave known_hosts. Change-Id: Iea32ad3aedbee996db53655842061d14c9e3d876 --- modules/jenkins_slave/files/known_hosts | 4 ++++ modules/jenkins_slave/manifests/jenkinsuser.pp | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 modules/jenkins_slave/files/known_hosts diff --git a/modules/jenkins_slave/files/known_hosts b/modules/jenkins_slave/files/known_hosts new file mode 100644 index 0000000000..335b9b6b5b --- /dev/null +++ b/modules/jenkins_slave/files/known_hosts @@ -0,0 +1,4 @@ +|1|OJlmbqcf6hDyGiueyGvlkVtsnbM=|gZmRc6ICJ93qm9k07K7kavNQeK8= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDtdLzDzG6qmejiZq5BxDqxkN71W08xuQWVZ+6784SpsXTUujKT49lNCXmH+IHijsRaigU9cVFkWErVez0Q+NtUe077c5s50zCrL7EwH5/aiwaYklHF566TO7ctOJBLLsoVOUlJGpUAjM4veG9XMz0KhTP9qYK3zqNOcPV++551bQu1rc3kR8R8C/etmP60zMhVkUAdgyPWFZbmKlrBv1SxIpvjSo5STZzSRS7DK5/D9BaWS3zOcl5Pqtv0FVjm83dmQJxMPEjFo8e0T4Gq/noxYafQse4811/Ucmxj8J5rlJchakfxJz827w3MWYR4Ku+X3QAy/deBuvzUn3z35Zwr +|1|ED5cPaPlxg4p6tThq+iwQw9DWzk=|hyynBHmEAf8RTalBpTfvpX1Ijek= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDtdLzDzG6qmejiZq5BxDqxkN71W08xuQWVZ+6784SpsXTUujKT49lNCXmH+IHijsRaigU9cVFkWErVez0Q+NtUe077c5s50zCrL7EwH5/aiwaYklHF566TO7ctOJBLLsoVOUlJGpUAjM4veG9XMz0KhTP9qYK3zqNOcPV++551bQu1rc3kR8R8C/etmP60zMhVkUAdgyPWFZbmKlrBv1SxIpvjSo5STZzSRS7DK5/D9BaWS3zOcl5Pqtv0FVjm83dmQJxMPEjFo8e0T4Gq/noxYafQse4811/Ucmxj8J5rlJchakfxJz827w3MWYR4Ku+X3QAy/deBuvzUn3z35Zwr +|1|d48JkTFKcmd4eghssuYGuEWY6FQ=|/4kjP4ZiLs77IR4pXcv2XNPRfK8= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfTQI130c6KPnRwy4KPMV+Ky9vJPSH/uwydojqcyAeKCGniGuF0Cyrye+UUvM0+KjOJ2H+Ekhy+A0Mg3v06W3PXbNCwxwvvS81tfJMse0rR1s0cjz77bWGuGeGxli6GP/HPlbjP0arGf0hkze1U9z/IyXrawoiVuWQUcQKelJtAqbloT1LheZUY35BPkC84W79hnhB3yRt6WrSjoxeUFaWVvWwZPpD7jMd2/0GED3pqofGz2Y4DS1/TqFFr5euoHe7iIQ/ihC0SyDDVbL9lqHxjsCtNzAwfu48mUCikA6lLGZJNFGGBFQNCvF2WZZLFXpzEsneqE+9pDpHIel/uqAd +|1|ZFufFQSCH/y6vuXL8ybMHMScEnM=|JAiydwN4g2Ombg70QCLJS/iJRJA= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfTQI130c6KPnRwy4KPMV+Ky9vJPSH/uwydojqcyAeKCGniGuF0Cyrye+UUvM0+KjOJ2H+Ekhy+A0Mg3v06W3PXbNCwxwvvS81tfJMse0rR1s0cjz77bWGuGeGxli6GP/HPlbjP0arGf0hkze1U9z/IyXrawoiVuWQUcQKelJtAqbloT1LheZUY35BPkC84W79hnhB3yRt6WrSjoxeUFaWVvWwZPpD7jMd2/0GED3pqofGz2Y4DS1/TqFFr5euoHe7iIQ/ihC0SyDDVbL9lqHxjsCtNzAwfu48mUCikA6lLGZJNFGGBFQNCvF2WZZLFXpzEsneqE+9pDpHIel/uqAd diff --git a/modules/jenkins_slave/manifests/jenkinsuser.pp b/modules/jenkins_slave/manifests/jenkinsuser.pp index 0110c7a35a..3fc570f58f 100644 --- a/modules/jenkins_slave/manifests/jenkinsuser.pp +++ b/modules/jenkins_slave/manifests/jenkinsuser.pp @@ -81,7 +81,6 @@ define jenkinsuser($ensure = present) { require => File['jenkinshome'], } - file { 'jenkinsbazaarwhoami': name => '/home/jenkins/.bazaar/bazaar.conf', owner => 'jenkins', @@ -91,5 +90,16 @@ define jenkinsuser($ensure = present) { ensure => 'present', require => File['jenkinsbazaardir'], } + + file { 'jenkinsknownhosts': + name => '/home/jenkins/.ssh/known_hosts', + owner => 'jenkins', + group => 'jenkins', + mode => 640, + ensure => 'present', + require => File['jenkinssshdir'], + source => [ + "puppet:///modules/jenkins_slave/files/known_hosts", + ], + } } -