Skip to content

Commit ddeda7c

Browse files
MoteHuepriteau
authored andcommitted
Fix cinder etcd3gw backend_url
Multiple parameters in the URL should be prefixed with an ampersand. Closes-Bug: #2085908 Change-Id: Ia9e43f7043c0757e11e1924c3df9fe16c037d484 (cherry picked from commit d808d71)
1 parent e4aae33 commit ddeda7c

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,5 +264,5 @@ backend_url = {{ redis_connection_string }}
264264
# and https://review.opendev.org/466098 for details
265265
# NOTE(jan.gutter): etcd v3.4 removed the default `v3alpha` api_version. Until
266266
# tooz defaults to a newer version, we should explicitly specify `v3`
267-
backend_url = etcd3+{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ etcd_client_port }}?api_version=v3{% if openstack_cacert %}?ca_cert={{ openstack_cacert }}{% endif %}
267+
backend_url = etcd3+{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ etcd_client_port }}?api_version=v3{% if openstack_cacert %}&ca_cert={{ openstack_cacert }}{% endif %}
268268
{% endif %}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes a bug where the etcd3gw ``backend_url`` in cinder.conf would be
5+
invalid when ``openstack_cacert`` was set.
6+
`LP#2085908 <https://bugs.launchpad.net/kolla-ansible/+bug/2085908>`__

0 commit comments

Comments
 (0)