diff --git a/defaults/main.yml b/defaults/main.yml index e3a6fa2..5af82a2 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -91,6 +91,10 @@ magnum_galera_user: magnum magnum_galera_use_ssl: "{{ galera_use_ssl | default(False) }}" magnum_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('') }}" magnum_galera_port: "{{ galera_port | default('3306') }}" +magnum_db_max_overflow: "{{ openstack_db_max_overflow | default('50') }}" +magnum_db_max_pool_size: "{{ openstack_db_max_pool_size | default('5') }}" +magnum_db_pool_timeout: "{{ openstack_db_pool_timeout | default('30') }}" +magnum_db_connection_recycle_time: "{{ openstack_db_connection_recycle_time | default('600') }}" # Oslo Messaging vars # RPC diff --git a/templates/magnum.conf.j2 b/templates/magnum.conf.j2 index 5c4edf3..0128bf6 100644 --- a/templates/magnum.conf.j2 +++ b/templates/magnum.conf.j2 @@ -23,7 +23,11 @@ region_name = {{ magnum_cinder_service_region }} endpoint_type = internalURL [database] -connection = mysql+pymysql://{{ magnum_galera_user }}:{{ magnum_galera_password }}@{{ magnum_galera_address }}/{{ magnum_galera_database_name }}?charset=utf8{% if magnum_galera_use_ssl | bool %}&ssl_verify_cert=true{% if magnum_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ magnum_galera_ssl_ca_cert }}{% endif %}{% endif %} +connection = mysql+pymysql://{{ magnum_galera_user }}:{{ magnum_galera_password }}@{{ magnum_galera_address }}/{{ magnum_galera_database_name }}?charset=utf8{% if magnum_galera_use_ssl | bool %}&ssl_verify_cert=true{% if magnum_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ magnum_galera_ssl_ca_cert }}{% endif %}{% endif +%} +max_overflow = {{ magnum_db_max_overflow }} +max_pool_size = {{ magnum_db_max_pool_size }} +pool_timeout = {{ magnum_db_pool_timeout }} +connection_recycle_time = {{ magnum_db_connection_recycle_time }} [glance_client] region_name = {{ magnum_glance_service_region }}