Merge lp:~jjo/charms/trusty/percona-cluster/add-wait-timeout into lp:~openstack-charmers-archive/charms/trusty/percona-cluster/next

[JuanJo Ciarlante]

=== modified file 'config.yaml'
--- config.yaml	2015-02-16 14:12:42 +0000
+++ config.yaml	2015-03-04 15:31:57 +0000
@@ -11,6 +11,10 @@
     default: -1
     type: int
     description: Maximum connections to allow. -1 means use the server's compiled in default.
+  wait-timeout:
+    default: -1
+    type: int
+    description: The number of seconds the server waits for activity on a noninteractive connection before closing it. -1 means use the server's compiled in default.
   root-password:
     type: string
     default:

=== modified file 'hooks/charmhelpers/contrib/database/mysql.py'
--- hooks/charmhelpers/contrib/database/mysql.py	2015-02-27 10:17:54 +0000
+++ hooks/charmhelpers/contrib/database/mysql.py	2015-03-04 15:31:57 +0000
@@ -1,6 +1,5 @@
 """Helper for working with a MySQL database"""
 import json
-import socket
 import re
 import sys
 import platform
@@ -22,7 +21,6 @@
     log,
     DEBUG,
     INFO,
-    WARNING,
 )
 from charmhelpers.fetch import (
     apt_install,
@@ -359,6 +357,9 @@
         if 'max-connections' in config:
             mysql_config['max_connections'] = config['max-connections']
 
+        if 'wait-timeout' in config:
+            mysql_config['wait_timeout'] = config['wait-timeout']
+
         # Set a sane default key_buffer size
         mysql_config['key_buffer'] = self.human_to_bytes('32M')
         total_memory = self.human_to_bytes(self.get_mem_total())

=== modified file 'templates/my.cnf'
--- templates/my.cnf	2015-02-16 14:12:42 +0000
+++ templates/my.cnf	2015-03-04 15:31:57 +0000
@@ -59,6 +59,11 @@
 max_connections = {{ max_connections }}
 {% endif %}
 
+# Seconds before clearing idle connections
+{% if wait_timeout != -1 %}
+wait_timeout = {{ wait_timeout }}
+{% endif %}
+
 # Fine tuning
 key_buffer_size = {{ key_buffer }}
 table_open_cache = {{ table_open_cache }}