opendev/system-config
Code Issues Proposed changes

Switch gerritbot to project-config

Browse Source 
Change-Id: I952a16dac32625e829d1fccb9e2472640cd31fd5
This commit is contained in:
James E. Blair 2014-09-19 18:32:25 -07:00
parent f6cd98b7d0
commit 70cd379a2c
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/gerritbot/manifests/init.pp
View File

@ -8,6 +8,7 @@ class gerritbot(
$vhost_name = '',
$ssh_rsa_key_contents = '',
$ssh_rsa_pubkey_contents = '',
$channel_file = '',
) {
include pip
@ -56,7 +57,7 @@ class gerritbot(
owner => 'root',
replace => true,
require => User['gerrit2'],
source => 'puppet:///modules/gerritbot/gerritbot_channel_config.yaml',
source => $channel_file,
}
file { '/etc/gerritbot/logging.config':

2
modules/openstack_project/manifests/review.pp
View File

@ -201,6 +201,8 @@ class openstack_project::review (
vhost_name => $::fqdn,
ssh_rsa_key_contents => $gerritbot_ssh_rsa_key_contents,
ssh_rsa_pubkey_contents => $gerritbot_ssh_rsa_pubkey_contents,
channel_file => $::project_config::gerritbot_channel_file,
require => $::project_config::config_dir,
}
class { 'gerrit::remotes':
ensure => absent,

1
modules/project_config/manifests/init.pp
View File

@ -32,6 +32,7 @@ class project_config(
}
$accessbot_channels_yaml = "/etc/project-config/${base}accessbot/channels.yaml"
$gerritbot_channel_file = "/etc/project-config/${base}gerritbot/channels.yaml"
$gerrit_acls_dir = "/etc/project-config/${base}gerrit/acls"
$gerrit_notify_impact_file = "/etc/project-config/${base}gerrit/notify_impact.yaml"
$jeepyb_project_file = "/etc/project-config/${base}gerrit/projects.yaml"