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

Merge "Remove usage of deprecated filter_nodes function"

This commit is contained in:
Jenkins 2016-03-23 15:56:24 +00:00 committed by Gerrit Code Review
parent edf29e1753 590590b907
commit 01c6fd5820
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,10 +24,10 @@ $current_roles = hiera('roles')
$network_metadata = hiera_hash('network_metadata') $network_metadata = hiera_hash('network_metadata')
$elasticsearch_kibana = hiera_hash('elasticsearch_kibana', {}) $elasticsearch_kibana = hiera_hash('elasticsearch_kibana', {})
$es_nodes = filter_nodes(hiera('nodes'), 'role', 'elasticsearch_kibana') $es_nodes = get_nodes_hash_by_roles($network_metadata, ['elasticsearch_kibana'])
$influxdb_grafana = hiera_hash('influxdb_grafana', {}) $influxdb_grafana = hiera_hash('influxdb_grafana', {})
$influxdb_nodes = filter_nodes(hiera('nodes'), 'role', 'influxdb_grafana') $influxdb_nodes = get_nodes_hash_by_roles($network_metadata, ['influxdb_grafana'])
if $lma_collector['environment_label'] != '' { if $lma_collector['environment_label'] != '' {
$environment_label = $lma_collector['environment_label'] $environment_label = $lma_collector['environment_label']

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

@ -58,7 +58,7 @@ if $alerting_mode == 'remote' {
$nagios_server = $network_metadata['vips']['infrastructure_alerting_mgmt_vip']['ipaddr'] $nagios_server = $network_metadata['vips']['infrastructure_alerting_mgmt_vip']['ipaddr']
} else { } else {
# compatibility with the LMA Infrastructure Alerting plugin 0.8 # compatibility with the LMA Infrastructure Alerting plugin 0.8
$nagios_nodes = filter_nodes(hiera('nodes'), 'role', 'infrastructure_alerting') $nagios_nodes = get_nodes_hash_by_roles($network_metadata, ['infrastructure_alerting'])
$nagios_server = $nagios_nodes[0]['internal_address'] $nagios_server = $nagios_nodes[0]['internal_address']
} }
$nagios_user = $lma_infra_alerting['nagios_user'] $nagios_user = $lma_infra_alerting['nagios_user']

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

@ -432,7 +432,7 @@ if $influxdb_mode != 'disabled' {
} else { } else {
# compatibility with the InfluxDB-Grafana plugin 0.8 # compatibility with the InfluxDB-Grafana plugin 0.8
$influxdb_grafana = hiera_hash('influxdb_grafana', {}) $influxdb_grafana = hiera_hash('influxdb_grafana', {})
$influxdb_nodes = filter_nodes(hiera('nodes'), 'role', 'influxdb_grafana') $influxdb_nodes = get_nodes_hash_by_roles($network_metadata, ['influxdb_grafana'])
$influxdb_server = $influxdb_nodes[0]['internal_address'] $influxdb_server = $influxdb_nodes[0]['internal_address']
} }
} else { } else {
@ -476,7 +476,7 @@ if $alerting_mode == 'remote' {
$nagios_server = $network_metadata['vips']['infrastructure_alerting_mgmt_vip']['ipaddr'] $nagios_server = $network_metadata['vips']['infrastructure_alerting_mgmt_vip']['ipaddr']
} else { } else {
# compatibility with the LMA Infrastructure Alerting plugin 0.8 # compatibility with the LMA Infrastructure Alerting plugin 0.8
$nagios_nodes = filter_nodes(hiera('nodes'), 'role', 'infrastructure_alerting') $nagios_nodes = get_nodes_hash_by_roles($network_metadata, ['infrastructure_alerting'])
$nagios_server = $nagios_nodes[0]['internal_address'] $nagios_server = $nagios_nodes[0]['internal_address']
} }
$nagios_user = $lma_infra_alerting['nagios_user'] $nagios_user = $lma_infra_alerting['nagios_user']