openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use loadbalancer to connect to etcd"

Browse Source
This commit is contained in:
Zuul 2023-02-17 08:55:34 +00:00 committed by Gerrit Code Review
commit b1e5a97028
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/roles/cinder/templates/cinder.conf.j2
View File

@ -238,9 +238,8 @@ verify_ssl_path = {{ openstack_cacert }}
{% if cinder_coordination_backend == 'redis' %} {% if cinder_coordination_backend == 'redis' %}
backend_url = {{ redis_connection_string }} backend_url = {{ redis_connection_string }}
{% elif cinder_coordination_backend == 'etcd' %} {% elif cinder_coordination_backend == 'etcd' %}
# NOTE(yoctozepto): etcd-compatible tooz drivers do not support multiple endpoints here (verified in Stein, Train)
# NOTE(yoctozepto): we must use etcd3gw (aka etcd3+http) due to issues with alternative (etcd3) and eventlet (as used by cinder) # NOTE(yoctozepto): we must use etcd3gw (aka etcd3+http) due to issues with alternative (etcd3) and eventlet (as used by cinder)
# see https://bugs.launchpad.net/kolla-ansible/+bug/1854932 # see https://bugs.launchpad.net/kolla-ansible/+bug/1854932
# and https://review.opendev.org/466098 for details # and https://review.opendev.org/466098 for details
backend_url = etcd3+{{ etcd_protocol }}://{{ 'api' | kolla_address(groups['etcd'][0]) | put_address_in_context('url') }}:{{ etcd_client_port }} backend_url = etcd3+{{ internal_protocol }}://{{ kolla_internal_vip_address }}:{{ etcd_client_port }}
{% endif %} {% endif %}

3
ansible/roles/ironic/templates/ironic-inspector.conf.j2
View File

@ -83,9 +83,8 @@ dnsmasq_interface = {{ ironic_dnsmasq_interface }}
{% if ironic_coordination_backend == 'redis' %} {% if ironic_coordination_backend == 'redis' %}
backend_url = {{ redis_connection_string }} backend_url = {{ redis_connection_string }}
{% elif ironic_coordination_backend == 'etcd' %} {% elif ironic_coordination_backend == 'etcd' %}
# NOTE(yoctozepto): etcd-compatible tooz drivers do not support multiple endpoints here (verified in Stein, Train)
# NOTE(yoctozepto): we must use etcd3gw (aka etcd3+http) due to issues with alternative (etcd3) and eventlet (as used by cinder) # NOTE(yoctozepto): we must use etcd3gw (aka etcd3+http) due to issues with alternative (etcd3) and eventlet (as used by cinder)
# see https://bugs.launchpad.net/kolla-ansible/+bug/1854932 # see https://bugs.launchpad.net/kolla-ansible/+bug/1854932
# and https://review.opendev.org/466098 for details # and https://review.opendev.org/466098 for details
backend_url = etcd3+{{ etcd_protocol }}://{{ 'api' | kolla_address(groups['etcd'][0]) | put_address_in_context('url') }}:{{ etcd_client_port }} backend_url = etcd3+{{ internal_protocol }}://{{ kolla_internal_vip_address }}:{{ etcd_client_port }}
{% endif %} {% endif %}

6
releasenotes/notes/use-loadbalancer-for-etcdgw-coordination-6704a8b1389bbabe.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
Services using etcd3gw via tooz now use etcd via haproxy. This removes
a single point of failure, where we hardcoded the first etcd host for
backend_url.