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. No need to copied it to
/var/www/cgi-bin/aodh folder.

Change-Id: Iacb08fba8a238c3d4ef075aa58d38b439409b2f5
This commit is contained in:
ZhongShengping 2018-03-26 15:14:48 +08:00 committed by zhongshengping
parent d2f5570823
commit 3088bf5d0e
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ansible/roles/aodh/templates/wsgi-aodh.conf.j2
View File

@ -1,23 +1,20 @@
{% 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 }}:{{ aodh_api_port }} Listen {{ api_interface_address }}:{{ aodh_api_port }}
ServerSignature Off ServerSignature Off
ServerTokens Prod ServerTokens Prod
TraceEnable off TraceEnable off
<VirtualHost *:{{ aodh_api_port }}> <Directory "{{ binary_path }}">
<FilesMatch "^aodh-api$">
## Vhost docroot
DocumentRoot "/var/www/cgi-bin/aodh"
## Directories, there should at least be a declaration for /var/www/cgi-bin/aodh
<Directory "/var/www/cgi-bin/aodh">
Options Indexes FollowSymLinks MultiViews Options Indexes FollowSymLinks MultiViews
AllowOverride None AllowOverride None
Require all granted Require all granted
</FilesMatch>
</Directory> </Directory>
<VirtualHost *:{{ aodh_api_port }}>
## Logging ## Logging
ErrorLog "/var/log/kolla/aodh/aodh_wsgi_error.log" ErrorLog "/var/log/kolla/aodh/aodh_wsgi_error.log"
ServerSignature Off ServerSignature Off
@ -26,5 +23,5 @@ TraceEnable off
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIDaemonProcess aodh group=aodh processes={{ openstack_service_workers }} threads=1 user=aodh python-path={{ python_path }} WSGIDaemonProcess aodh group=aodh processes={{ openstack_service_workers }} threads=1 user=aodh python-path={{ python_path }}
WSGIProcessGroup aodh WSGIProcessGroup aodh
WSGIScriptAlias / "/var/www/cgi-bin/aodh/app.wsgi" WSGIScriptAlias / "{{ binary_path }}/aodh-api"
</VirtualHost> </VirtualHost>