opendev/system-config
Code Issues Proposed changes

Merge "Moved the server class settings out of the eavesdrop class"

Browse Source
This commit is contained in:
Jenkins 2015-07-08 22:27:52 +00:00 committed by Gerrit Code Review
commit 9953ddf035
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/site.pp
View File

@ -288,10 +288,14 @@ node 'planet.openstack.org' {
# Node-OS: precise # Node-OS: precise
node 'eavesdrop.openstack.org' { node 'eavesdrop.openstack.org' {
class { 'openstack_project::server':
iptables_public_tcp_ports => [80],
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::eavesdrop': class { 'openstack_project::eavesdrop':
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', 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', []),
statusbot_nick => hiera('statusbot_nick', 'username'), statusbot_nick => hiera('statusbot_nick', 'username'),
statusbot_password => hiera('statusbot_nick_password', 'XXX'), statusbot_password => hiera('statusbot_nick_password', 'XXX'),
statusbot_server => 'chat.freenode.net', statusbot_server => 'chat.freenode.net',

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

@ -2,7 +2,6 @@
class openstack_project::eavesdrop ( class openstack_project::eavesdrop (
$nickpass = '', $nickpass = '',
$sysadmins = [],
$statusbot_nick = '', $statusbot_nick = '',
$statusbot_password = '', $statusbot_password = '',
$statusbot_server = '', $statusbot_server = '',
@ -16,10 +15,6 @@ class openstack_project::eavesdrop (
$accessbot_password = '', $accessbot_password = '',
$project_config_repo = '', $project_config_repo = '',
) { ) {
class { 'openstack_project::server':
iptables_public_tcp_ports => [80],
sysadmins => $sysadmins
}
include apache include apache
include meetbot include meetbot