From 6c372312ad5d0101820bf57eeb9300070e2dd307 Mon Sep 17 00:00:00 2001 From: ramboman Date: Wed, 18 Mar 2020 20:47:39 +0800 Subject: [PATCH] [octavia] Adds region_name if enable_barbican Adds necessary "region_name" to octavia.conf when "enable_barbican" is set to "true". Closes-Bug: #1867926 Change-Id: Ida61cef4b9c9622a5e925bac4583fba281469a39 --- ansible/roles/octavia/templates/octavia.conf.j2 | 3 +++ .../notes/add-region-name-for-octavia-292594e29ef36bf2.yaml | 6 ++++++ 2 files changed, 9 insertions(+) create mode 100644 releasenotes/notes/add-region-name-for-octavia-292594e29ef36bf2.yaml diff --git a/ansible/roles/octavia/templates/octavia.conf.j2 b/ansible/roles/octavia/templates/octavia.conf.j2 index 48bb231eb9..fed48e9cd4 100644 --- a/ansible/roles/octavia/templates/octavia.conf.j2 +++ b/ansible/roles/octavia/templates/octavia.conf.j2 @@ -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 diff --git a/releasenotes/notes/add-region-name-for-octavia-292594e29ef36bf2.yaml b/releasenotes/notes/add-region-name-for-octavia-292594e29ef36bf2.yaml new file mode 100644 index 0000000000..094435f937 --- /dev/null +++ b/releasenotes/notes/add-region-name-for-octavia-292594e29ef36bf2.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Adds necessary ``region_name`` to ``octavia.conf`` when + ``enable_barbican`` is set to ``true``. `LP#1867926 + `__