openstack/kolla-ansible
Code Issues Proposed changes

Use the pbr generated wsgi binary file located in binary folder

Browse Source 
Since pbr 1.4.0, wsgi_scripts entrypoing is supported and it will
generated a wsgi compatible binary file.

Change-Id: I4192258226ec94b667913fd6fe099c4923145ea7
This commit is contained in:
ZhongShengping 2018-03-26 15:28:54 +08:00
parent c3987096e5
commit 2ad8776ece
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ansible/roles/cloudkitty/templates/wsgi-cloudkitty.conf.j2
View File

@ -1,4 +1,5 @@
{% 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 }}:{{ cloudkitty_api_port }} Listen {{ api_interface_address }}:{{ cloudkitty_api_port }}
ServerSignature Off ServerSignature Off
@ -13,10 +14,12 @@ TraceEnable off
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIDaemonProcess cloudkitty group=cloudkitty processes={{ openstack_service_workers }} threads=1 user=cloudkitty python-path={{ python_path }} WSGIDaemonProcess cloudkitty group=cloudkitty processes={{ openstack_service_workers }} threads=1 user=cloudkitty python-path={{ python_path }}
WSGIProcessGroup cloudkitty WSGIProcessGroup cloudkitty
WSGIScriptAlias / "{{ python_path }}/cloudkitty/api/app.wsgi" WSGIScriptAlias / "{{ binary_path }}/cloudkitty-api"
<Directory "{{ python_path }}/cloudkitty/api"> <Directory "{{ binary_path }}">
Require all granted <FilesMatch "^cloudkitty-api$">
Require all granted
</FilesMatch>
</Directory> </Directory>
</VirtualHost> </VirtualHost>