From 0460f86a300f8f20f34797c1ecb74a33d51bcfd2 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Fri, 13 May 2016 12:49:28 -0400 Subject: [PATCH] Add nodepool_ssh_public_key Because we are using the devuser element for zuulv2.5 (zuul-worker element). We also need to pass in the public SSH key for nodepool. Change-Id: Idda577e5cb210ca2018f4a9eb497457026e53cdb Signed-off-by: Paul Belanger --- manifests/init.pp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/manifests/init.pp b/manifests/init.pp index 603ad39..1b3447b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -21,6 +21,7 @@ class nodepool ( $mysql_root_password, $mysql_password, $nodepool_ssh_private_key, + $nodepool_ssh_public_key = undef, $git_source_repo = 'https://git.openstack.org/openstack-infra/nodepool', $revision = 'master', $statsd_host = undef, @@ -236,6 +237,17 @@ class nodepool ( require => File['/home/nodepool/.ssh'], } + if ($nodepool_ssh_public_key != undef) { + file { '/home/nodepool/.ssh/id_rsa.pub': + ensure => present, + content => $nodepool_ssh_public_key, + mode => '0644', + owner => 'nodepool', + group => 'nodepool', + require => File['/home/nodepool/.ssh'], + } + } + file { '/home/nodepool/.ssh/config': ensure => present, source => 'puppet:///modules/nodepool/ssh.config',