Merge "Add neutron.conf [database] options"

This commit is contained in:
Jenkins 2015-06-22 15:06:07 +00:00 committed by Gerrit Code Review
commit 966d076808
2 changed files with 6 additions and 0 deletions

View File

@ -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

View File

@ -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 %}