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

Use hiera_hash for network data 

Change-Id: I171d08e974d635d85b391c3bc29366f0f4dd7b59
Closes-Bug: #1585350
This commit is contained in:
Simon Pasquier 2016-05-25 10:44:31 +02:00
parent 63b02430eb
commit 1f759e7f3d
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@
notice('fuel-plugin-lma-collector: aggregator.pp')
prepare_network_config(hiera('network_scheme', {}))
prepare_network_config(hiera_hash('network_scheme', {}))
$mgmt_address = get_network_role_property('management', 'ipaddr')
$lma_collector = hiera_hash('lma_collector')
$is_controller = roles_include(['controller', 'primary-controller'])

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

@ -15,7 +15,7 @@
notice('fuel-plugin-lma-collector: base.pp')
# TODO(spasquier): fail if Neutron isn't used
prepare_network_config(hiera('network_scheme', {}))
prepare_network_config(hiera_hash('network_scheme', {}))
$fuel_version = 0 + hiera('fuel_version')
$lma_collector = hiera_hash('lma_collector')
$is_controller = roles_include(['controller', 'primary-controller'])

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

@ -14,7 +14,7 @@
notice('fuel-plugin-lma-collector: controller.pp')
prepare_network_config(hiera('network_scheme', {}))
prepare_network_config(hiera_hash('network_scheme', {}))
$messaging_address = get_network_role_property('mgmt/messaging', 'ipaddr')
$memcache_address = get_network_role_property('mgmt/memcache', 'ipaddr')
$network_metadata = hiera_hash('network_metadata')

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

@ -14,7 +14,7 @@
notice('fuel-plugin-lma-collector: hiera_override.pp')
prepare_network_config(hiera('network_scheme', {}))
prepare_network_config(hiera_hash('network_scheme', {}))
$plugin_data = hiera_hash('lma_collector', undef)
if ($plugin_data) {

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

@ -14,13 +14,13 @@
notice('fuel-plugin-lma-collector: lma_backends.pp')
prepare_network_config(hiera('network_scheme', {}))
prepare_network_config(hiera_hash('network_scheme', {}))
$mgmt_address = get_network_role_property('management', 'ipaddr')
$influxdb_grafana = hiera('influxdb_grafana')
if hiera('lma::collector::influxdb::server', false) {
$network_metadata = hiera('network_metadata')
$network_metadata = hiera_hash('network_metadata')
$is_elasticsearch_node = roles_include(['elasticsearch_kibana', 'primary-elasticsearch_kibana'])
$is_influxdb_node = roles_include(['influxdb_grafana', 'primary-influxdb_grafana'])