opendev/system-config
Code Issues Proposed changes

Switch accessbot to project-config

Browse Source 
Change-Id: Ie1e6416c0b6d70d647b3c3bcef8843cc06dc73f4
This commit is contained in:
James E. Blair 2014-09-19 18:13:26 -07:00
parent c348a3237f
commit 180308970e
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/site.pp
View File

@ -252,6 +252,7 @@ node 'planet.openstack.org' {
# Node-OS: precise # Node-OS: precise
node 'eavesdrop.openstack.org' { node 'eavesdrop.openstack.org' {
class { 'openstack_project::eavesdrop': class { 'openstack_project::eavesdrop':
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
nickpass => hiera('openstack_meetbot_password', 'XXX'), nickpass => hiera('openstack_meetbot_password', 'XXX'),
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
statusbot_nick => hiera('statusbot_nick', 'username'), statusbot_nick => hiera('statusbot_nick', 'username'),

8
modules/openstack_project/manifests/eavesdrop.pp
View File

@ -14,6 +14,7 @@ class openstack_project::eavesdrop (
$statusbot_wiki_pageid = '', $statusbot_wiki_pageid = '',
$accessbot_nick = '', $accessbot_nick = '',
$accessbot_password = '', $accessbot_password = '',
$project_config_repo = '',
) { ) {
class { 'openstack_project::server': class { 'openstack_project::server':
iptables_public_tcp_ports => [80], iptables_public_tcp_ports => [80],
@ -97,10 +98,15 @@ class openstack_project::eavesdrop (
ensure => present, ensure => present,
} }
class { 'project_config':
url => $project_config_repo,
}
class { 'accessbot': class { 'accessbot':
nick => $accessbot_nick, nick => $accessbot_nick,
password => $accessbot_password, password => $accessbot_password,
server => $statusbot_server, server => $statusbot_server,
channel_file => 'puppet:///modules/openstack_project/accessbot/channels.yaml', channel_file => $::project_config::accessbot_channels_yaml,
require => $::project_config::config_dir,
} }
} }

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

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