diff --git a/defaults/main.yml b/defaults/main.yml index 02413bd0..e2105c8e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -130,6 +130,10 @@ glance_galera_user: glance glance_galera_use_ssl: "{{ galera_use_ssl | default(False) }}" glance_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('') }}" glance_galera_port: "{{ galera_port | default('3306') }}" +glance_db_max_overflow: "{{ openstack_db_max_overflow | default('50') }}" +glance_db_max_pool_size: "{{ openstack_db_max_pool_size | default('5') }}" +glance_db_pool_timeout: "{{ openstack_db_pool_timeout | default('30') }}" +glance_db_connection_recycle_time: "{{ openstack_db_connection_recycle_time | default('600') }}" glance_role_name: admin glance_api_bind_address: "{{ openstack_service_bind_address | default('0.0.0.0') }}" diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2 index 94985ca3..d89f7281 100644 --- a/templates/glance-api.conf.j2 +++ b/templates/glance-api.conf.j2 @@ -36,7 +36,11 @@ enabled_backends = {% for backend in glance_available_stores %}{{ ('name' in bac task_executor = {{ glance_task_executor }} [database] -connection = mysql+pymysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8{% if glance_galera_use_ssl | bool %}&ssl_verify_cert=true{% if glance_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ glance_galera_ssl_ca_cert }}{% endif %}{% endif %} +connection = mysql+pymysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8{% if glance_galera_use_ssl | bool %}&ssl_verify_cert=true{% if glance_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ glance_galera_ssl_ca_cert }}{% endif %}{% endif +%} +max_overflow = {{ glance_db_max_overflow }} +max_pool_size = {{ glance_db_max_pool_size }} +pool_timeout = {{ glance_db_pool_timeout }} +connection_recycle_time = {{ glance_db_connection_recycle_time }} [keystone_authtoken] insecure = {{ keystone_service_internaluri_insecure | bool }} diff --git a/templates/glance-manage.conf.j2 b/templates/glance-manage.conf.j2 index 3161b834..c668c786 100644 --- a/templates/glance-manage.conf.j2 +++ b/templates/glance-manage.conf.j2 @@ -6,4 +6,8 @@ use_journal = True fatal_deprecations = {{ glance_fatal_deprecations }} [database] -connection = mysql+pymysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8{% if glance_galera_use_ssl | bool %}&ssl_verify_cert=true{% if glance_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ glance_galera_ssl_ca_cert }}{% endif %}{% endif %} +connection = mysql+pymysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8{% if glance_galera_use_ssl | bool %}&ssl_verify_cert=true{% if glance_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ glance_galera_ssl_ca_cert }}{% endif %}{% endif +%} +max_overflow = {{ glance_db_max_overflow }} +max_pool_size = {{ glance_db_max_pool_size }} +pool_timeout = {{ glance_db_pool_timeout }} +connection_recycle_time = {{ glance_db_connection_recycle_time }}