From ff5745fe29d2acc578f8d7f55b2ebd5684654fb1 Mon Sep 17 00:00:00 2001
From: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date: Wed, 16 Jul 2014 15:50:01 +0100
Subject: [PATCH] [ivoks,r=] Add support for setting neutron-alchemy-flags

---
 config.yaml                             | 5 +++++
 revision                                | 2 +-
 templates/folsom/ovs_quantum_plugin.ini | 5 +++++
 templates/parts/section-database        | 5 +++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/config.yaml b/config.yaml
index 4758fd46..31affeb1 100644
--- a/config.yaml
+++ b/config.yaml
@@ -128,6 +128,11 @@ options:
   ssl_key:
     type: string
     description: SSL key to use with certificate specified as ssl_cert.
+  neutron-alchemy-flags:
+    default: None
+    type: string
+      Comma separated list of key=value sqlalchemy related config flags to be
+      set in plugin ini file.
   ssl_ca:
     type: string
     description: |
diff --git a/revision b/revision
index 1b79f38e..c15fb720 100644
--- a/revision
+++ b/revision
@@ -1 +1 @@
-500
+501
diff --git a/templates/folsom/ovs_quantum_plugin.ini b/templates/folsom/ovs_quantum_plugin.ini
index 0113ad27..356cf042 100644
--- a/templates/folsom/ovs_quantum_plugin.ini
+++ b/templates/folsom/ovs_quantum_plugin.ini
@@ -16,6 +16,11 @@ reconnect_interval = 2
 {% else -%}
 connection = sqlite:////var/lib/quantum/quantum.sqlite
 {% endif -%}
+{% if neutron_alchemy_flags -%}
+{% for key, value in neutron_alchemy_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
 
 [SECURITYGROUP]
 {% if neutron_security_groups -%}
diff --git a/templates/parts/section-database b/templates/parts/section-database
index ae4a5ba0..0a8ca3c0 100644
--- a/templates/parts/section-database
+++ b/templates/parts/section-database
@@ -2,3 +2,8 @@
 [database]
 connection = {{ database_type }}://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}{% if database_ssl_ca %}?ssl_ca={{ database_ssl_ca }}{% if database_ssl_cert %}&ssl_cert={{ database_ssl_cert }}&ssl_key={{ database_ssl_key }}{% endif %}{% endif %}
 {% endif -%}
+{% if neutron_alchemy_flags -%}
+{% for key, value in neutron_alchemy_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}