Merge "[octavia] Adds region_name if enable_barbican"

This commit is contained in:
Zuul 2020-04-27 13:51:12 +00:00 committed by Gerrit Code Review
commit 1939c3ce68
2 changed files with 9 additions and 0 deletions

View File

@ -13,6 +13,9 @@ bind_port = {{ octavia_api_listen_port }}
ca_private_key_passphrase = {{ octavia_ca_password }}
ca_private_key = /etc/octavia/certs/private/cakey.pem
ca_certificate = /etc/octavia/certs/ca_01.pem
{% if enable_barbican | bool %}
region_name = {{ openstack_region_name }}
{% endif %}
[haproxy_amphora]
server_ca = /etc/octavia/certs/ca_01.pem

View File

@ -0,0 +1,6 @@
---
fixes:
- |
Adds necessary ``region_name`` to ``octavia.conf`` when
``enable_barbican`` is set to ``true``. `LP#1867926
<https://launchpad.net/bugs/1867926>`__