From f11c2ff23fe3454ca5efa827ff8d72127b4d8ef3 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Fri, 13 May 2016 12:53:11 -0400 Subject: [PATCH] Add nodepool_ssh_public_key to nodepool.o.o We need to have access to the current jenkins user public SSH key because we are going to be switching to the zuul-worker DIB element. Change-Id: Idb4ef11576671180060fb5b2b1202f9bfec5fd47 Depends-On: Ib56a7fa632dc7b5a7cb2b6d37c676ac5b105ee6a Signed-off-by: Paul Belanger --- manifests/site.pp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index 06b2788311..d1258f5ff3 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -727,6 +727,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_private_key => hiera('jenkins_ssh_private_key_contents'), oscc_file_contents => $clouds_yaml, image_log_document_root => '/var/log/nodepool/image',