opendev/puppet-elastic_recheck
Code Issues Proposed changes

Move elastic-recheck bot to status.o.o

Browse Source 
Also, normalize some parameters to the status manifest to make it
more readable (since they follow the same pattern).  And make the
ssh config for elastic-recheck bot match reviewday.

Change-Id: I2417f121e7b3685aab9540504cdd4c6db1754e67
This commit is contained in:
James E. Blair 2013-12-31 11:11:55 -08:00
parent e7347b3e95
commit 342eda2a9d
2 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
manifests/bot.pp
View File

@ -18,13 +18,12 @@
# #
class elastic_recheck::bot ( class elastic_recheck::bot (
$gerrit_host, $gerrit_host,
$gerrit_ssh_private_key, $gerrit_ssh_host_key = '',
$gerrit_ssh_private_key_contents, $recheck_gerrit_user = 'elasticrecheck',
#not used today, will be used when elastic-recheck supports it. $recheck_ssh_private_key = '',
$elasticsearch_url, $recheck_ssh_public_key = '',
$recheck_bot_passwd, $recheck_bot_passwd,
$gerrit_user = 'elasticrecheck', $recheck_bot_nick,
$recheck_bot_nick = 'openstackrecheck',
) { ) {
include elastic_recheck include elastic_recheck
@ -53,13 +52,37 @@ class elastic_recheck::bot (
require => Class['elastic_recheck'], require => Class['elastic_recheck'],
} }
file { $gerrit_ssh_private_key: if $recheck_ssh_private_key != '' {
ensure => present, file { '/home/recheck/.ssh/id_rsa':
mode => '0600', owner => 'recheck',
owner => 'recheck', group => 'recheck',
group => 'recheck', mode => '0600',
content => $gerrit_ssh_private_key_contents, content => $recheck_ssh_private_key,
require => Class['elastic_recheck'], replace => true,
require => File['/home/recheck/.ssh/']
}
}
if $recheck_ssh_public_key != '' {
file { '/home/recheck/.ssh/id_rsa.pub':
owner => 'recheck',
group => 'recheck',
mode => '0600',
content => $recheck_ssh_public_key,
replace => true,
require => File['/home/recheck/.ssh/']
}
}
if $gerrit_ssh_host_key != '' {
file { '/home/recheck/.ssh/known_hosts':
owner => 'recheck',
group => 'recheck',
mode => '0600',
content => "${gerrit_host} ${gerrit_ssh_host_key}",
replace => true,
require => File['/home/recheck/.ssh/']
}
} }
file { '/etc/init.d/elastic-recheck': file { '/etc/init.d/elastic-recheck':

4
templates/elastic-recheck.conf.erb
View File

@ -8,7 +8,7 @@ channel_config=/etc/elastic-recheck/recheckwatchbot.yaml
log_config=/etc/elastic-recheck/logging.config log_config=/etc/elastic-recheck/logging.config
[gerrit] [gerrit]
user=<%= gerrit_user %>
host=<%= gerrit_host %> host=<%= gerrit_host %>
user=<%= recheck_gerrit_user %>
query_file=/etc/elastic-recheck/queries query_file=/etc/elastic-recheck/queries
key=<%= gerrit_ssh_private_key %> key=/home/recheck/.ssh/id_rsa