Skip to content
Snippets Groups Projects
Commit 1939c3ce authored by Zuul's avatar Zuul Committed by Gerrit Code Review
Browse files

Merge "[octavia] Adds region_name if enable_barbican"

parents c151449e 6c372312
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
---
fixes:
- |
Adds necessary ``region_name`` to ``octavia.conf`` when
``enable_barbican`` is set to ``true``. `LP#1867926
<https://launchpad.net/bugs/1867926>`__
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment