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

Merge "MySQL password must be a string representation"

This commit is contained in:
Jenkins 2016-06-28 11:20:17 +00:00 committed by Gerrit Code Review
parent 63bc389716 9cdc55c6c0
commit a8006c09fe
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,7 @@ class {'lma_monitoring_analytics::grafana':
db_host => $db_host,
db_name => hiera('lma::grafana::mysql::dbname'),
db_username => hiera('lma::grafana::mysql::username'),
db_password => hiera('lma::grafana::mysql::password'),
db_password => rstrip(hiera('lma::grafana::mysql::password')),
admin_username => hiera('lma::grafana::mysql::admin_username'),
admin_password => hiera('lma::grafana::mysql::admin_password'),
domain => hiera('lma::influxdb::vip'),

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 = hiera('lma::grafana::mysql::password')
$db_password = rstrip(hiera('lma::grafana::mysql::password'))
file { $db_options_file:
ensure => file,

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

@ -132,7 +132,9 @@ lma::grafana::mysql::host: <%= @host %>
lma::grafana::mysql::mode: <%= @db_mode %>
lma::grafana::mysql::dbname: <%= @db_name %>
lma::grafana::mysql::username: <%= @db_username %>
lma::grafana::mysql::password: <%= @db_password %>
# MySQL password must be a string representation, see bug/1596438
lma::grafana::mysql::password: >
<%= @db_password %>
lma::grafana::mysql::admin_username: <%= @admin_username %>
lma::grafana::mysql::admin_password: <%= @admin_password %>