opendev/system-config
Code Issues Proposed changes

Merge "Add mqtt_statsd to firehose config"

Browse Source
This commit is contained in:
Jenkins 2017-04-11 21:04:36 +00:00 committed by Gerrit Code Review
commit 66c6598c91
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/site.pp
View File

@ -199,6 +199,7 @@ node 'puppetdb01.openstack.org' {
# Node-OS: trusty
node 'graphite.openstack.org' {
$statsd_hosts = ['git.openstack.org',
'firehose01.openstack.org',
'logstash.openstack.org',
'nodepool.openstack.org',
'nl01.openstack.org',
@ -530,6 +531,7 @@ node /^firehose\d+\.openstack\.org$/ {
imap_hostname => hiera('lpmqtt_imap_server'),
imap_username => hiera('lpmqtt_imap_username'),
imap_password => hiera('lpmqtt_imap_password'),
statsd_host => 'graphite.openstack.org',
}
}

1
modules.env
View File

@ -129,6 +129,7 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-mailman"]="origi
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-mediawiki"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-meetbot"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-mosquitto"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-mqtt_statsd"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-mysql_backup"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-nodepool"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-odsreg"]="origin/master"

7
modules/openstack_project/manifests/firehose.pp
View File

@ -26,6 +26,7 @@ class openstack_project::firehose (
$mqtt_hostname = 'firehose.openstack.org',
$mqtt_password,
$mqtt_username = 'infra',
$statsd_host,
$ca_file,
$cert_file,
$key_file,
@ -99,4 +100,10 @@ class openstack_project::firehose (
imap_use_ssl => false,
imap_delete_old => true,
}
include mqtt_statsd
class {'mqtt_statsd::server':
mqtt_hostname => $mqtt_hostname,
statsd_hostname => $statsd_host,
}
}