openstack/kolla-ansible
Code Issues Proposed changes

Merge "Error path of WSGIScriptAlias of panko for ubuntu"

Browse Source
This commit is contained in:
Zuul 2018-04-04 01:01:57 +00:00 committed by Gerrit Code Review
commit 73c9c4210c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ansible/roles/panko/templates/wsgi-panko.conf.j2
View File

@ -1,10 +1,17 @@
{% set python_path = '/usr/lib/python2.7/site-packages' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %} {% set python_path = '/usr/lib/python2.7/site-packages' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %}
{% set binary_path = '/usr/bin' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
Listen {{ api_interface_address }}:{{ panko_api_port }} Listen {{ api_interface_address }}:{{ panko_api_port }}
ServerSignature Off ServerSignature Off
ServerTokens Prod ServerTokens Prod
TraceEnable off TraceEnable off
<Directory "{{ binary_path }}">
<FilesMatch "^panko-api$">
Require all granted
</FilesMatch>
</Directory>
<VirtualHost *:{{ panko_api_port }}> <VirtualHost *:{{ panko_api_port }}>
ErrorLog "/var/log/kolla/panko/panko-api-error.log" ErrorLog "/var/log/kolla/panko/panko-api-error.log"
@ -13,10 +20,6 @@ TraceEnable off
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIDaemonProcess panko group=panko processes={{ openstack_service_workers }} threads=1 user=panko python-path={{ python_path }} WSGIDaemonProcess panko group=panko processes={{ openstack_service_workers }} threads=1 user=panko python-path={{ python_path }}
WSGIProcessGroup panko WSGIProcessGroup panko
WSGIScriptAlias / "{{ python_path }}/panko/api/app.wsgi" WSGIScriptAlias / "{{ binary_path }}/panko-api"
<Directory "{{ python_path }}/panko/api">
Require all granted
</Directory>
</VirtualHost> </VirtualHost>