opendev/puppet-nodepool
Code Issues Proposed changes

Merge "Add SSH public key to nodepool-builder"

Browse Source
This commit is contained in:
Jenkins
2016-11-29 17:58:54 +00:00
committed by Gerrit Code Review
parent 3a2e9c0d34 c2e9f66d73
commit ad163ceb22
2 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
manifests/init.pp
View File

@@ -200,14 +200,6 @@ class nodepool (
require => User['nodepool'],
}
file { '/home/nodepool/.ssh':
ensure => directory,
mode => '0500',
owner => 'nodepool',
group => 'nodepool',
require => User['nodepool'],
}
file { '/home/nodepool/.ssh/id_rsa':
ensure => present,
content => $nodepool_ssh_private_key,
@@ -217,17 +209,6 @@ 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',
@@ -442,11 +423,25 @@ class nodepool (
if ($install_nodepool_builder) {
class { '::nodepool::builder':
nodepool_ssh_public_key => $nodepool_ssh_public_key,
statsd_host => $statsd_host,
environment => $environment,
builder_logging_conf_template => $builder_logging_conf_template,
build_workers => $build_workers,
upload_workers => $upload_workers,
}
} else {
# For now, conditionally include this, since this code also lives in
# nodepool-builder. One things have settled down with zuulv3 effort, we
# should refactor this into a common.pp file.
if ! defined(File['/home/nodepool/.ssh']) {
file { '/home/nodepool/.ssh':
ensure => directory,
mode => '0500',
owner => 'nodepool',
group => 'nodepool',
require => User['nodepool'],
}
}
}
}