From f4e1005f9ecc99c66e1f12992ff2286722d53944 Mon Sep 17 00:00:00 2001
From: bklei <bradley.klein@twcable.com>
Date: Fri, 4 Dec 2015 08:13:41 -0700
Subject: [PATCH] Use params class for api and pers settings

Simplify how to set username and password via hiera,
use params for vertica settings.

Change-Id: I73779412f8ab3f2356d2fa1563b3dbfc14b2e247
---
 manifests/params.pp                 |  5 +++++
 manifests/vertica/config.pp         | 23 +++++++----------------
 templates/agent.yaml.erb            |  2 +-
 templates/checks/nagios_wrapper.erb |  2 +-
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 64e50bc..175babf 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -86,7 +86,12 @@ class monasca::params(
     }
 ) {
   validate_string($admin_password)
+  validate_string($user_password)
   validate_string($agent_password)
+  validate_string($sql_password)
+  validate_string($sql_host)
+  validate_string($api_db_password)
+  validate_string($pers_db_password)
 
   if $::osfamily == 'Debian' {
     $agent_package = 'monasca-agent'
diff --git a/manifests/vertica/config.pp b/manifests/vertica/config.pp
index 2833bb8..322f847 100644
--- a/manifests/vertica/config.pp
+++ b/manifests/vertica/config.pp
@@ -5,12 +5,6 @@
 #
 # === Parameters
 #
-# [*api_db_password*]
-#   database api user password
-#
-# [*api_db_user*]
-#   database api user name
-#
 # [*api_pool*]
 #   name of the resource pool for monasca api process
 #
@@ -77,15 +71,7 @@
 # [*pers_pool_priority*]
 #   priority threshold persister resource pool
 #
-# [*pers_db_password*]
-#   database persister user password
-#
-# [*pers_db_user*]
-#   database persister user name
-#
 class monasca::vertica::config (
-  $api_db_password                   = unset,
-  $api_db_user                       = 'mon_api',
   $api_pool                          = 'api_pool',
   $api_pool_mem_size                 = '5G',
   $api_pool_max_mem_size             = '15G',
@@ -100,8 +86,6 @@ class monasca::vertica::config (
   $metrics_schema                    = 'puppet:///modules/monasca/vertica/mon_metrics_schema.sql',
   $monitor_password                  = unset,
   $monitor_user                      = 'monitor',
-  $pers_db_password                  = unset,
-  $pers_db_user                      = 'mon_persister',
   $pers_pool                         = 'persister_pool',
   $pers_pool_mem_size                = '5G',
   $pers_pool_max_mem_size            = '15G',
@@ -112,6 +96,13 @@ class monasca::vertica::config (
   $pers_pool_priority                = '60',
 ) {
 
+  include ::monasca::params
+
+  $api_db_user = $::monasca::params::api_db_user
+  $api_db_password = $::monasca::params::api_db_password
+  $pers_db_user = $::monasca::params::pers_db_user
+  $pers_db_password = $::monasca::params::pers_db_password
+
   $files = 'puppet:///modules/monasca/vertica/'
   $templates = 'monasca/vertica'
   $install_dir = '/var/vertica'
diff --git a/templates/agent.yaml.erb b/templates/agent.yaml.erb
index c5a58d9..fdbb46c 100644
--- a/templates/agent.yaml.erb
+++ b/templates/agent.yaml.erb
@@ -23,7 +23,7 @@ Main:
 <%- end -%>
   dimensions:
 <%- @dimensions.each_pair do |key, value| -%>
-    <%= @key %>: <%= @value %>
+    <%= key %>: <%= value %>
 <%- end -%>
   recent_point_threshold: <%= @recent_point_threshold %>
   check_freq: <%= @check_freq %>
diff --git a/templates/checks/nagios_wrapper.erb b/templates/checks/nagios_wrapper.erb
index fb4a6e9..46e44c1 100644
--- a/templates/checks/nagios_wrapper.erb
+++ b/templates/checks/nagios_wrapper.erb
@@ -12,6 +12,6 @@
 <%- if @dimensions -%>
    dimensions: 
 <%- @dimensions.each do |key, value| -%>
-      <%= @key %>: <%= @value %>
+      <%= key %>: <%= value %>
 <%- end -%>
 <%- end -%>