openstack
/
puppet-barbican
Code Issues Proposed changes

Merge "Debian: do not configure gunicorn-config.py"

This commit is contained in:
Zuul 2020-05-31 15:12:27 +00:00 committed by Gerrit Code Review
parent fba752a0d7 60d3b68266
commit 29f4f0b9eb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/api.pp
View File

@ -486,11 +486,14 @@ deprecated and will be removed in a future release. Use openstack-barbican-api i
tag => 'barbican-service', tag => 'barbican-service',
} }
file_line { 'Modify bind_port in gunicorn-config.py': # Debian is using UWSGI, not gunicorn
path => '/etc/barbican/gunicorn-config.py', if $::os_package_type != 'debian' {
line => "bind = '${bind_host}:${bind_port}'", file_line { 'Modify bind_port in gunicorn-config.py':
match => '.*bind = .*', path => '/etc/barbican/gunicorn-config.py',
tag => 'modify-bind-port', line => "bind = '${bind_host}:${bind_port}'",
match => '.*bind = .*',
tag => 'modify-bind-port',
}
} }
} elsif $service_name == 'httpd' { } elsif $service_name == 'httpd' {