openstack/kolla-ansible
Code Issues Proposed changes

Merge "Set the etcd internal hostname and cacert for tls internal enabled deployments"

Browse Source
This commit is contained in:
Zuul 2023-03-08 18:36:46 +00:00 committed by Gerrit Code Review
commit f565011d98
3 changed files with 10 additions and 2 deletions
ansible/roles
cinder/templates
cinder.conf.j2
ironic/templates
ironic-inspector.conf.j2
releasenotes/notes
fix-etcd-coordination-config-b1c9f900ef13be13.yaml

2
ansible/roles/cinder/templates/cinder.conf.j2

@ -241,5 +241,5 @@ backend_url = {{ redis_connection_string }}
# 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
# and https://review.opendev.org/466098 for details
backend_url = etcd3+{{ internal_protocol }}://{{ kolla_internal_vip_address }}:{{ etcd_client_port }}
backend_url = etcd3+{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ etcd_client_port }}{% if openstack_cacert %}?ca_cert={{ openstack_cacert }}{% endif %}
{% endif %}

2
ansible/roles/ironic/templates/ironic-inspector.conf.j2

@ -86,5 +86,5 @@ backend_url = {{ redis_connection_string }}
# 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
# and https://review.opendev.org/466098 for details
backend_url = etcd3+{{ internal_protocol }}://{{ kolla_internal_vip_address }}:{{ etcd_client_port }}
backend_url = etcd3+{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ etcd_client_port }}{% if openstack_cacert %}?ca_cert={{ openstack_cacert }}{% endif %}
{% endif %}

8
releasenotes/notes/fix-etcd-coordination-config-b1c9f900ef13be13.yaml Normal file

@ -0,0 +1,8 @@
---
fixes:
- |
Set the etcd internal hostname and cacert for tls internal enabled
deployments. This allows services to work with etcd when
coordination is enabled for TLS interal deployments. Without this
fix, the coordination backend fails to connect to etcd and the
service itself crashes.