Rejig template locations, fix db url for folsom

templates/folsom/ovs_quantum_plugin.ini

@@ -11,7 +11,7 @@ local_ip = {{ local_ip }}
 
 [DATABASE]
 {% if database_host -%}
-sql_connection = mysql://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}?quantum?charset=utf8
+sql_connection = mysql://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}?charset=utf8
 reconnect_interval = 2
 {% else -%}
 connection = sqlite:////var/lib/quantum/quantum.sqlite

templates/folsom/quantum.conf

@@ -13,7 +13,6 @@ core_plugin =  {{ core_plugin }}
 {% endif -%}
 api_paste_config = /etc/quantum/api-paste.ini
 auth_strategy = keystone
-control_exchange = quantum
 notification_driver = quantum.openstack.common.notifier.rpc_notifier
 default_notification_level = INFO
 notification_topics = notifications