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}"