openstack/kolla-ansible
Code Issues Proposed changes

Merge "Configure coordination in default for masakari-api"

Browse Source
This commit is contained in:
Zuul 2023-04-20 09:11:13 +00:00 committed by Gerrit Code Review
commit 226eb2aa99
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/group_vars/all.yml
View File

@ -405,6 +405,7 @@ mariadb_shard_backup_user_prefix: "backup_shard_"
mariadb_shards_info: "{{ groups['mariadb'] | database_shards_info() }}" mariadb_shards_info: "{{ groups['mariadb'] | database_shards_info() }}"
masakari_api_port: "15868" masakari_api_port: "15868"
masakari_coordination_backend: "{{ 'redis' if enable_redis | bool else 'etcd' if enable_etcd | bool else '' }}"
memcached_port: "11211" memcached_port: "11211"

9
ansible/roles/masakari/templates/masakari.conf.j2
View File

@ -70,3 +70,12 @@ policy_file = {{ masakari_policy_file }}
[taskflow] [taskflow]
connection = mysql+pymysql://{{ masakari_database_user }}:{{ masakari_database_password }}@{{ masakari_database_address }}/{{ masakari_database_name }} connection = mysql+pymysql://{{ masakari_database_user }}:{{ masakari_database_password }}@{{ masakari_database_address }}/{{ masakari_database_name }}
{% if service_name == 'masakari-api' %}
[coordination]
{% if masakari_coordination_backend == 'redis' %}
backend_url = {{ redis_connection_string }}
{% elif masakari_coordination_backend == 'etcd' %}
backend_url = etcd3+{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ etcd_client_port }}{% if openstack_cacert %}?ca_cert={{ openstack_cacert }}{% endif %}
{% endif %}
{% endif %}

6
releasenotes/notes/new-variable-masakari-coordination-backend-d3b742315a07aabc.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
Masakari coordination backend can now be configured via
masakari_coordination_backend variable.
Coordination is optional and can now be set to either redis or etcd.