openstack/openstack-ansible-os_barbican
Code Issues Proposed changes

Move database configuration to it's own section

Browse Source 
Defining database configuration in [DEFAULT] section was deprecated
and removed for 2024.2 cycle [1]

We also remove some RabbitMQ configuration from DEFAULT section
that do not have any effect as of today.

[1] https://review.opendev.org/c/openstack/barbican/+/848011

Change-Id: Ia189d0e8051f76b8eb46de19b5f309ab5ea6aac5
This commit is contained in:
Dmitriy Rabotyagov 2024-07-22 17:03:05 +02:00
parent 40c5de09a6
commit 57a5f46142
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@ -180,6 +180,7 @@ barbican_galera_port: "{{ galera_port | default('3306') }}"
# NOTE: barbican does not support pool_timeout so it is not set for this role
barbican_db_max_overflow: "{{ openstack_db_max_overflow | default('50') }}"
barbican_db_max_pool_size: "{{ openstack_db_max_pool_size | default('5') }}"
barbican_db_pool_timeout: "{{ openstack_db_pool_timeout | default('30') }}"
barbican_db_connection_recycle_time: "{{ openstack_db_connection_recycle_time | default('600') }}"
## Oslo Messaging

15
templates/barbican.conf.j2
View File

@ -12,16 +12,15 @@ debug = {{ debug }}
# communicate back with this service.
host_href = {{ barbican_service_publicurl }}
sql_connection = mysql+pymysql://{{ barbican_galera_user }}:{{ barbican_galera_password }}@{{ barbican_galera_address }}:{{ barbican_galera_port }}/{{ barbican_galera_database }}?charset=utf8{% if barbican_galera_use_ssl | bool %}&ssl_verify_cert=true{% if barbican_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ barbican_galera_ssl_ca_cert }}{% endif %}{% endif +%}
sql_pool_max_overflow = {{ barbican_db_max_overflow }}
sql_pool_size = {{ barbican_db_max_pool_size }}
sql_idle_timeout = {{ barbican_db_connection_recycle_time }}
# Rabbit and HA configuration:
ampq_durable_queues = True
rabbit_ha_queues = True
transport_url = {{ barbican_oslomsg_rpc_transport }}://{% for host in barbican_oslomsg_rpc_servers.split(',') %}{{ barbican_oslomsg_rpc_userid }}:{{ barbican_oslomsg_rpc_password }}@{{ host }}:{{ barbican_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ _barbican_oslomsg_rpc_vhost_conf }}{% if barbican_oslomsg_rpc_use_ssl | bool %}?ssl=1&ssl_version={{ barbican_oslomsg_rpc_ssl_version }}&ssl_ca_file={{ barbican_oslomsg_rpc_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
[database]
connection = mysql+pymysql://{{ barbican_galera_user }}:{{ barbican_galera_password }}@{{ barbican_galera_address }}:{{ barbican_galera_port }}/{{ barbican_galera_database }}?charset=utf8{% if barbican_galera_use_ssl | bool %}&ssl_verify_cert=true{% if barbican_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ barbican_galera_ssl_ca_cert }}{% endif %}{% endif +%}
max_overflow = {{ barbican_db_max_overflow }}
max_pool_size = {{ barbican_db_max_pool_size }}
pool_timeout = {{ barbican_db_pool_timeout }}
connection_recycle_time = {{ barbican_db_connection_recycle_time }}
[oslo_messaging_notifications]
driver = {{ (barbican_oslomsg_notify_configure | bool) | ternary('messagingv2', 'noop') }}
transport_url = {{ barbican_oslomsg_notify_transport }}://{% for host in barbican_oslomsg_notify_servers.split(',') %}{{ barbican_oslomsg_notify_userid }}:{{ barbican_oslomsg_notify_password }}@{{ host }}:{{ barbican_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ _barbican_oslomsg_notify_vhost_conf }}{% if barbican_oslomsg_notify_use_ssl | bool %}?ssl=1&ssl_version={{ barbican_oslomsg_notify_ssl_version }}&ssl_ca_file={{ barbican_oslomsg_notify_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}