From fcb385b950ed7c6810d098cc4843b9c9973edd2c Mon Sep 17 00:00:00 2001
From: git-harry <git-harry@live.co.uk>
Date: Mon, 22 Jun 2015 13:41:31 +0100
Subject: [PATCH] Add neutron.conf [database] options

This commit adds the following configuration options to the
neutron.conf template:
  - max_overflow
  - max_pool_size
  - pool_timeout
These options are configurable by setting the appropriate vars.

Change-Id: Ic3e9df3bccc63801e72f2c900d2fee163dfe6fc6
Closes-bug: #1461184
---
 defaults/main.yml         | 3 +++
 templates/neutron.conf.j2 | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/defaults/main.yml b/defaults/main.yml
index 2b59fd02..7212291e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -35,6 +35,9 @@ neutron_galera_database: neutron
 neutron_db_revision: head
 neutron_db_config: /etc/neutron/neutron.conf
 neutron_db_plugin: /etc/neutron/plugins/ml2/ml2_conf.ini
+neutron_db_max_overflow: 20
+neutron_db_pool_size: 10
+neutron_db_pool_timeout: 10
 
 ## Plugins
 neutron_plugin_core: neutron.plugins.ml2.plugin.Ml2Plugin
diff --git a/templates/neutron.conf.j2 b/templates/neutron.conf.j2
index 80d934d8..82b49438 100644
--- a/templates/neutron.conf.j2
+++ b/templates/neutron.conf.j2
@@ -120,6 +120,9 @@ check_revocations_for_cached = False
 
 [database]
 connection = mysql://{{ neutron_galera_user }}:{{ neutron_container_mysql_password }}@{{ neutron_galera_address }}/{{ neutron_galera_database }}?charset=utf8
+max_overflow = {{ neutron_db_max_overflow }}
+max_pool_size = {{ neutron_db_pool_size }}
+pool_timeout = {{ neutron_db_pool_timeout }}
 
 {% endif %}