Merge lp:~jjo/charm-helpers/add-wait-timeout into lp:charm-helpers

[JuanJo Ciarlante]

[jjo, r=] add wait-timeout config

[Jorge Niedbalski (niedbalski)]

Hello jjo,

I had to add a test for covering your changes, other than that, LGTM.

Thanks!

review: Approve

=== modified file 'charmhelpers/contrib/database/mysql.py'
--- charmhelpers/contrib/database/mysql.py	2015-02-27 16:10:02 +0000
+++ charmhelpers/contrib/database/mysql.py	2015-03-04 14:18:20 +0000
@@ -357,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())