openstack/kolla-ansible
Code Issues Proposed changes

[octavia] Adds region_name if enable_barbican

Browse Source 
Adds necessary "region_name" to octavia.conf when
"enable_barbican" is set to "true".

Closes-Bug: #1867926

Change-Id: Ida61cef4b9c9622a5e925bac4583fba281469a39
This commit is contained in:
ramboman 2020-03-18 20:47:39 +08:00 committed by Dincer Celik
parent 71a058d2f8
commit 6c372312ad
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
releasenotes/notes/add-region-name-for-octavia-292594e29ef36bf2.yaml Normal file
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>`__