From 6ddb5922a4a7e2b4723b83622cccebc39b014b56 Mon Sep 17 00:00:00 2001 From: Khai Do Date: Wed, 4 Feb 2015 09:55:17 -0800 Subject: [PATCH] Create the known_hosts file for zuul user on review-dev.o.o The zuul user on zuul-dev.o.o could not connect to review-dev.o.o because the /home/zuul/.ssh/known_hosts file did not get created. This causes zuul-merger to fail because it needs that to clone repos from review-dev.o.o. This change passes the gerrit public key from review-dev.o.o so that puppet can create the known_hosts file. Change-Id: Iae5d63cc7fd01dc68e4eef96a29bccda6f047eb3 --- manifests/site.pp | 1 + modules/openstack_project/manifests/zuul_dev.pp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/site.pp b/manifests/site.pp index aaf48ae4c7..7593813879 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -541,6 +541,7 @@ node 'zuul-dev.openstack.org' { project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', gerrit_server => 'review-dev.openstack.org', gerrit_user => 'zuul-dev', + gerrit_ssh_host_key => hiera('gerrit_dev_ssh_rsa_pubkey_contents', 'XXX'), zuul_ssh_private_key => hiera('zuul_dev_ssh_private_key_contents', 'XXX'), url_pattern => 'http://logs.openstack.org/{build.parameters[LOG_PATH]}', zuul_url => 'http://zuul-dev.openstack.org/p', diff --git a/modules/openstack_project/manifests/zuul_dev.pp b/modules/openstack_project/manifests/zuul_dev.pp index 35eacbac7c..ab954db6a5 100644 --- a/modules/openstack_project/manifests/zuul_dev.pp +++ b/modules/openstack_project/manifests/zuul_dev.pp @@ -70,7 +70,7 @@ class openstack_project::zuul_dev( owner => 'zuul', group => 'zuul', mode => '0600', - content => "review.openstack.org,23.253.232.87,2001:4800:7815:104:3bc3:d7f6:ff03:bf5d ${gerrit_ssh_host_key}", + content => "review-dev.openstack.org,23.253.78.13,2001:4800:7817:101:be76:4eff:fe04 ${gerrit_ssh_host_key}", replace => true, require => File['/home/zuul/.ssh'], }