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

Don't rstrip() literal strings from Hiera 

Change-Id: I20d36eb8eea6111d9d1052f8690925a2ec82a0e7
This commit is contained in:
Simon Pasquier 2017-01-10 09:47:05 +01:00
parent 5f57e8dbe8
commit e8b18384e5
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ if $ldap_enabled {
protocol => hiera('lma::grafana::ldap::protocol'),
port => hiera('lma::grafana::ldap::port'),
bind_dn => hiera('lma::grafana::ldap::bind_dn'),
bind_password => rstrip(hiera('lma::grafana::ldap::bind_password')),
bind_password => hiera('lma::grafana::ldap::bind_password'),
user_search_base_dns => hiera('lma::grafana::ldap::user_search_base_dns'),
user_search_filter => hiera('lma::grafana::ldap::user_search_filter'),
authorization_enabled => hiera('lma::grafana::ldap::authorization_enabled'),
@ -54,9 +54,9 @@ 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 => rstrip(hiera('lma::grafana::mysql::password')),
db_password => hiera('lma::grafana::mysql::password'),
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'),
domain => hiera('lma::influxdb::vip'),
http_port => hiera('lma::influxdb::grafana_port'),
version => '3.0.4-1464167696',

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

@ -160,11 +160,11 @@ lma::influxdb::wal::storage: <%= @influxdb_wal_storage %>
lma::influxdb::wal::size: <%= @influxdb_wal_size.to_i %>
lma::influxdb::admin_username: "root"
lma::influxdb::admin_password: >
lma::influxdb::admin_password: >-
<%= @influxdb_admin_password %>
lma::influxdb::username: <%= @influxdb_username %>
# InfluxDB password must be a string representation, see bug/1634461
lma::influxdb::password: >
lma::influxdb::password: >-
<%= @influxdb_password %>
lma::influxdb::dbname: <%= @influxdb_dbname %>
@ -180,10 +180,10 @@ lma::grafana::mysql::mode: <%= @db_mode %>
lma::grafana::mysql::dbname: <%= @db_name %>
lma::grafana::mysql::username: <%= @db_username %>
# MySQL password must be a string representation, see bug/1596438
lma::grafana::mysql::password: >
lma::grafana::mysql::password: >-
<%= @db_password %>
lma::grafana::mysql::admin_username: <%= @admin_username %>
lma::grafana::mysql::admin_password: >
lma::grafana::mysql::admin_password: >-
<%= @admin_password %>
lma::grafana::haproxy_service: grafana
@ -200,7 +200,7 @@ lma::grafana::ldap::servers: <%= @ldap_servers %>
lma::grafana::ldap::protocol: <%= @ldap_protocol %>
lma::grafana::ldap::port: <%= @ldap_port %>
lma::grafana::ldap::bind_dn: <%= @ldap_bind_dn %>
lma::grafana::ldap::bind_password: >
lma::grafana::ldap::bind_password: >-
<%= @ldap_bind_password %>
lma::grafana::ldap::user_search_base_dns: <%= @ldap_user_search_base_dns %>
lma::grafana::ldap::user_search_filter: <%= @ldap_user_search_filter %>

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

@ -21,9 +21,9 @@ $local_port = hiera('lma::influxdb::influxdb_port')
$influxdb_url = "http://${local_address}:${local_port}"
$admin_user = hiera('lma::influxdb::admin_username')
$admin_password = rstrip(hiera('lma::influxdb::admin_password'))
$admin_password = hiera('lma::influxdb::admin_password')
$username = hiera('lma::influxdb::username')
$password = rstrip(hiera('lma::influxdb::password'))
$password = hiera('lma::influxdb::password')
$retention_period = hiera('lma::influxdb::retention_period')
$replication_factor = hiera('lma::influxdb::replication_factor')