x
/
fuel-plugin-influxdb-grafana
Code Issues Proposed changes

Remove rstrip() calls 

These calls aren't needed anymore since the YAML data has been fixed.

Change-Id: I5a37da0176d439d0fd133734b67a6cb084ed99eb
This commit is contained in:
Simon Pasquier 2017-01-30 13:23:18 +01:00
parent a26c42fd31
commit 3fe1fff6a2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,9 +22,9 @@ $influxdb_port = hiera('lma::influxdb::influxdb_port')
$grafana_link_created_file = '/var/cache/grafana_link_created_up_1.x'
$admin_username = hiera('lma::grafana::mysql::admin_username')
$admin_password = rstrip(hiera('lma::grafana::mysql::admin_password'))
$admin_password = hiera('lma::grafana::mysql::admin_password')
$influxdb_username = hiera('lma::influxdb::username')
$influxdb_password = rstrip(hiera('lma::influxdb::password'))
$influxdb_password = hiera('lma::influxdb::password')
$influxdb_database = hiera('lma::influxdb::dbname')
$lma_collector = hiera_hash('lma_collector', {})

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

@ -31,7 +31,7 @@ host=<%= @db_vip %>
')
$db_name = hiera('lma::grafana::mysql::dbname')
$db_username = hiera('lma::grafana::mysql::username')
$db_password = rstrip(hiera('lma::grafana::mysql::password'))
$db_password = hiera('lma::grafana::mysql::password')
file { $db_options_file:
ensure => file,