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 <pabelanger@redhat.com>
This commit is contained in:
@@ -21,6 +21,7 @@ class nodepool (
|
|||||||
$mysql_root_password,
|
$mysql_root_password,
|
||||||
$mysql_password,
|
$mysql_password,
|
||||||
$nodepool_ssh_private_key,
|
$nodepool_ssh_private_key,
|
||||||
|
$nodepool_ssh_public_key = undef,
|
||||||
$git_source_repo = 'https://git.openstack.org/openstack-infra/nodepool',
|
$git_source_repo = 'https://git.openstack.org/openstack-infra/nodepool',
|
||||||
$revision = 'master',
|
$revision = 'master',
|
||||||
$statsd_host = undef,
|
$statsd_host = undef,
|
||||||
@@ -236,6 +237,17 @@ class nodepool (
|
|||||||
require => File['/home/nodepool/.ssh'],
|
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':
|
file { '/home/nodepool/.ssh/config':
|
||||||
ensure => present,
|
ensure => present,
|
||||||
source => 'puppet:///modules/nodepool/ssh.config',
|
source => 'puppet:///modules/nodepool/ssh.config',
|
||||||
|
|||||||
Reference in New Issue
Block a user