x
/
fuel-plugin-lma-collector
Code Issues Proposed changes

Fix InfluxDB address in collectd 

Change-Id: I64c1e0c2167eee98bf62c12776b16ef1fca794ad
Closes-Bug: #1614945
This commit is contained in:
Simon Pasquier 2016-08-19 14:43:35 +02:00
parent cfadbcfe9d
commit e63f55e829
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment_scripts/puppet/manifests/hiera_override.pp
View File

@ -76,6 +76,7 @@ if ($plugin_data) {
# InfluxDB
$is_influxdb_node = roles_include(['influxdb_grafana', 'primary-influxdb_grafana'])
$influxdb_listen_address = get_network_role_property('influxdb_vip', 'ipaddr')
$influxdb_mode = $plugin_data['influxdb_mode']
$influxdb_nodes = get_nodes_hash_by_roles($network_metadata, ['influxdb_grafana', 'primary-influxdb_grafana'])
$influxdb_nodes_count = count($influxdb_nodes)
@ -189,6 +190,9 @@ lma::collector::influxdb::database: <%= @influxdb_database %>
lma::collector::influxdb::user: <%= @influxdb_user %>
lma::collector::influxdb::password: <%= @influxdb_password %>
lma::collector::influxdb::root_password: <%= @influxdb_root_password %>
<% if $is_influxdb_node -%>
lma::collector::influxdb::listen_address: <%= @influxdb_listen_address %>
<% end -%>
<% end -%>
<% if @nagios_is_deployed -%>
lma::collector::infrastructure_alerting::server: <%= @nagios_server %>

2
deployment_scripts/puppet/manifests/lma_backends.pp
View File

@ -46,7 +46,7 @@ if hiera('lma::collector::influxdb::server', false) {
class { 'lma_collector::collectd::influxdb':
username => 'root',
password => hiera('lma::collector::influxdb::root_password'),
address => hiera('lma::collector::influxdb::listen_address', $mgmt_address),
address => hiera('lma::collector::influxdb::listen_address'),
port => hiera('lma::collector::influxdb::influxdb_port', 8086)
}
}