From d4c70c23035d52b5487a07eb2a40a2e5db46d74c Mon Sep 17 00:00:00 2001
From: bklei <bradley.klein@twcable.com>
Date: Tue, 11 Aug 2015 10:18:31 -0600
Subject: [PATCH] Allow changing the checkConnectionWhileIdle flag for api

Change-Id: I5c2f17577a13b74049aa7fb58b7d08306a9ffa12
---
 manifests/api.pp             | 36 ++++++++++++++++++++----------------
 templates/api-config.yml.erb |  4 ++--
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/manifests/api.pp b/manifests/api.pp
index b42c593..ce7741d 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -10,6 +10,9 @@
 # [*blobmirror*]
 #   url of server to install debians from
 #
+# [*check_conn_while_idle*]
+#   flag for whether db connection should stay alive while idle
+#
 # [*database_type*]
 #   type of database backend, influxdb or vertica
 #
@@ -53,22 +56,23 @@
 #   list of zookeeper servers and ports
 #
 class monasca::api (
-  $api_user             = 'monasca_api',
-  $blobmirror           = undef,
-  $database_type        = 'influxdb',
-  $database_host        = 'localhost',
-  $db_admin_password    = undef,
-  $gzip_setting         = true,
-  $kafka_brokers        = undef,
-  $keystone_endpoint    = undef,
-  $keystone_admin_token = undef,
-  $mon_api_build_ver    = undef,
-  $mon_api_deb          = undef,
-  $region_name          = 'NA',
-  $role_delegate        = 'monitoring-delegate',
-  $roles_default        = ['admin','monasca-user','_member_'],
-  $roles_agent          = ['monasca-agent'],
-  $zookeeper_servers    = undef,
+  $api_user              = 'monasca_api',
+  $blobmirror            = undef,
+  $check_conn_while_idle = true,
+  $database_type         = 'influxdb',
+  $database_host         = 'localhost',
+  $db_admin_password     = undef,
+  $gzip_setting          = true,
+  $kafka_brokers         = undef,
+  $keystone_endpoint     = undef,
+  $keystone_admin_token  = undef,
+  $mon_api_build_ver     = undef,
+  $mon_api_deb           = undef,
+  $region_name           = 'NA',
+  $role_delegate         = 'monitoring-delegate',
+  $roles_default         = ['admin','monasca-user','_member_'],
+  $roles_agent           = ['monasca-agent'],
+  $zookeeper_servers     = undef,
 ) {
   include ::monasca
   include ::monasca::params
diff --git a/templates/api-config.yml.erb b/templates/api-config.yml.erb
index e439678..2fc9536 100644
--- a/templates/api-config.yml.erb
+++ b/templates/api-config.yml.erb
@@ -24,7 +24,7 @@ mysql:
   validationQuery: "/* MyService Health Check */ SELECT 1"
   minSize: 8
   maxSize: 32
-  checkConnectionWhileIdle: false
+  checkConnectionWhileIdle: <%= check_conn_while_idle %>
   checkConnectionOnBorrow: true
 
 databaseConfiguration:
@@ -49,7 +49,7 @@ vertica:
   validationQuery: "/* MyService Health Check */ SELECT 1"
   minSize: 4
   maxSize: 32
-  checkConnectionWhileIdle: false
+  checkConnectionWhileIdle: <%= check_conn_while_idle %>
 
 middleware:
   enabled: true