From 8fa6f8cf804b1d1044fc0ca50d3d3237d5c18a0a Mon Sep 17 00:00:00 2001 From: Alex Kozyrev Date: Thu, 10 Jan 2019 12:48:01 -0500 Subject: [PATCH] Enclose Barbican API host into square brackets in case of IPv6 Barbican fails to start in case of IPv6 configuration: "Error: ':2:9311' is not a valid port number." Wrong parsing of IPv6 host address can be fixed by adding []. Also dropping '' for API workers number for the sake of consistency. Change-Id: Ie40a0338d202dfa1cc17810db56d902b14e5accf Closes-Bug: 1810558 Signed-off-by: Alex Kozyrev --- puppet-manifests/centos/build_srpm.data | 2 +- .../src/modules/openstack/manifests/barbican.pp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/puppet-manifests/centos/build_srpm.data b/puppet-manifests/centos/build_srpm.data index 8521910bff..bbbc6b0b21 100644 --- a/puppet-manifests/centos/build_srpm.data +++ b/puppet-manifests/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="src" -TIS_PATCH_VER=75 +TIS_PATCH_VER=76 diff --git a/puppet-manifests/src/modules/openstack/manifests/barbican.pp b/puppet-manifests/src/modules/openstack/manifests/barbican.pp index 7e4d3769ad..e2afe0b305 100644 --- a/puppet-manifests/src/modules/openstack/manifests/barbican.pp +++ b/puppet-manifests/src/modules/openstack/manifests/barbican.pp @@ -91,13 +91,16 @@ class openstack::barbican::api file_line { 'Modify workers in gunicorn-config.py': path => '/etc/barbican/gunicorn-config.py', - line => "workers = '${api_workers}'", + line => "workers = ${api_workers}", match => '.*workers = .*', tag => 'modify-workers', } include ::platform::network::mgmt::params - $api_host = $::platform::network::mgmt::params::controller_address + $api_host = $::platform::network::mgmt::params::subnet_version ? { + 6 => "[${::platform::network::mgmt::params::controller_address}]", + default => $::platform::network::mgmt::params::controller_address, + } $api_fqdn = $::platform::params::controller_hostname $url_host = "http://${api_fqdn}:${api_port}"