From c6193a22165d2d69aac447da2ee7150306254054 Mon Sep 17 00:00:00 2001 From: Swann Croiset Date: Tue, 18 Oct 2016 14:27:20 +0200 Subject: [PATCH] Enforce string type for passwords in hiera data Related-Bug: #1634461 Change-Id: I203c2b0719d7ca2464bd034c6fea2404d693e1f1 --- deployment_scripts/puppet/manifests/grafana.pp | 4 ++-- .../puppet/manifests/grafana_configuration.pp | 4 ++-- deployment_scripts/puppet/manifests/hiera.pp | 13 +++++++++---- .../puppet/manifests/influxdb_configuration.pp | 4 ++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/deployment_scripts/puppet/manifests/grafana.pp b/deployment_scripts/puppet/manifests/grafana.pp index 730fcea6..200c6681 100644 --- a/deployment_scripts/puppet/manifests/grafana.pp +++ b/deployment_scripts/puppet/manifests/grafana.pp @@ -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 => hiera('lma::grafana::ldap::bind_password'), + bind_password => rstrip(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'), @@ -56,7 +56,7 @@ class {'lma_monitoring_analytics::grafana': db_username => hiera('lma::grafana::mysql::username'), db_password => rstrip(hiera('lma::grafana::mysql::password')), admin_username => hiera('lma::grafana::mysql::admin_username'), - admin_password => hiera('lma::grafana::mysql::admin_password'), + admin_password => rstrip(hiera('lma::grafana::mysql::admin_password')), domain => hiera('lma::influxdb::vip'), http_port => hiera('lma::influxdb::grafana_port'), version => '3.0.4-1464167696', diff --git a/deployment_scripts/puppet/manifests/grafana_configuration.pp b/deployment_scripts/puppet/manifests/grafana_configuration.pp index cf597975..b3bb9820 100644 --- a/deployment_scripts/puppet/manifests/grafana_configuration.pp +++ b/deployment_scripts/puppet/manifests/grafana_configuration.pp @@ -22,9 +22,9 @@ $influxdb_port = hiera('lma::influxdb::influxdb_port') $grafana_link_created_file = '/var/cache/grafana_link_created' $admin_username = hiera('lma::grafana::mysql::admin_username') -$admin_password = hiera('lma::grafana::mysql::admin_password') +$admin_password = rstrip(hiera('lma::grafana::mysql::admin_password')) $influxdb_username = hiera('lma::influxdb::username') -$influxdb_password = hiera('lma::influxdb::password') +$influxdb_password = rstrip(hiera('lma::influxdb::password')) $influxdb_database = hiera('lma::influxdb::dbname') $lma_collector = hiera_hash('lma_collector', {}) diff --git a/deployment_scripts/puppet/manifests/hiera.pp b/deployment_scripts/puppet/manifests/hiera.pp index 8ba754cc..4729b5af 100644 --- a/deployment_scripts/puppet/manifests/hiera.pp +++ b/deployment_scripts/puppet/manifests/hiera.pp @@ -150,9 +150,12 @@ 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: <%= @influxdb_admin_password %> +lma::influxdb::admin_password: > + <%= @influxdb_admin_password %> lma::influxdb::username: <%= @influxdb_username %> -lma::influxdb::password: <%= @influxdb_password %> +# InfluxDB password must be a string representation, see bug/1634461 +lma::influxdb::password: > + <%= @influxdb_password %> lma::influxdb::dbname: <%= @influxdb_dbname %> lma::grafana::listen_address: "<%= @grafana_listen_address %>" @@ -170,7 +173,8 @@ lma::grafana::mysql::username: <%= @db_username %> lma::grafana::mysql::password: > <%= @db_password %> lma::grafana::mysql::admin_username: <%= @admin_username %> -lma::grafana::mysql::admin_password: <%= @admin_password %> +lma::grafana::mysql::admin_password: > + <%= @admin_password %> lma::grafana::haproxy_service: grafana lma::grafana::tls::enabled: <%= @tls_enabled %> @@ -186,7 +190,8 @@ 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: <%= @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 %> lma::grafana::ldap::group_search_base_dns: <%= @ldap_group_search_base_dns %> diff --git a/deployment_scripts/puppet/manifests/influxdb_configuration.pp b/deployment_scripts/puppet/manifests/influxdb_configuration.pp index 4ba76fcb..954d600d 100644 --- a/deployment_scripts/puppet/manifests/influxdb_configuration.pp +++ b/deployment_scripts/puppet/manifests/influxdb_configuration.pp @@ -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 = hiera('lma::influxdb::admin_password') +$admin_password = rstrip(hiera('lma::influxdb::admin_password')) $username = hiera('lma::influxdb::username') -$password = hiera('lma::influxdb::password') +$password = rstrip(hiera('lma::influxdb::password')) $retention_period = hiera('lma::influxdb::retention_period') $replication_factor = hiera('lma::influxdb::replication_factor')