From 2b419fd7b8325829594a498fe851736a109513d7 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 31 May 2016 14:46:34 -0400 Subject: [PATCH] Add zuul-worker public key to nodepool.o.o We need to do this over a series of commits, to make sure we don't break things. Here we are adding the new public key for our zuul-worker images. This is used by the zuul user in our DIB images. Change-Id: I948b9c49d3c9eb719a448205146e290148906b8c Signed-off-by: Paul Belanger --- manifests/site.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 0f8a0b7ae4..1d89727043 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -777,9 +777,9 @@ node 'nodepool.openstack.org' { project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', mysql_password => hiera('nodepool_mysql_password'), mysql_root_password => hiera('nodepool_mysql_root_password'), - # NOTE(pabelanger): Once we delete our jenkins masters, this key should be moved - # into hiera. - nodepool_ssh_public_key => $openstack_project::jenkins_ssh_key, + nodepool_ssh_public_key => hiera('zuul_worker_ssh_public_key_contents'), + # TODO(pabelanger): Switch out private key with zuul_worker once we are + # ready. nodepool_ssh_private_key => hiera('jenkins_ssh_private_key_contents'), oscc_file_contents => $clouds_yaml, image_log_document_root => '/var/log/nodepool/image',