From 2ad8776ece63b5ac7c4917b6a87a2be7f75bd79e Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Mon, 26 Mar 2018 15:28:54 +0800
Subject: [PATCH] Use the pbr generated wsgi binary file located in binary
folder
Since pbr 1.4.0, wsgi_scripts entrypoing is supported and it will
generated a wsgi compatible binary file.
Change-Id: I4192258226ec94b667913fd6fe099c4923145ea7
---
.../roles/cloudkitty/templates/wsgi-cloudkitty.conf.j2 | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/ansible/roles/cloudkitty/templates/wsgi-cloudkitty.conf.j2 b/ansible/roles/cloudkitty/templates/wsgi-cloudkitty.conf.j2
index 4018efe447..3e64413762 100644
--- a/ansible/roles/cloudkitty/templates/wsgi-cloudkitty.conf.j2
+++ b/ansible/roles/cloudkitty/templates/wsgi-cloudkitty.conf.j2
@@ -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 binary_path = '/usr/bin' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
Listen {{ api_interface_address }}:{{ cloudkitty_api_port }}
ServerSignature Off
@@ -13,10 +14,12 @@ TraceEnable off
WSGIApplicationGroup %{GLOBAL}
WSGIDaemonProcess cloudkitty group=cloudkitty processes={{ openstack_service_workers }} threads=1 user=cloudkitty python-path={{ python_path }}
WSGIProcessGroup cloudkitty
- WSGIScriptAlias / "{{ python_path }}/cloudkitty/api/app.wsgi"
+ WSGIScriptAlias / "{{ binary_path }}/cloudkitty-api"
- <Directory "{{ python_path }}/cloudkitty/api">
- Require all granted
+ <Directory "{{ binary_path }}">
+ <FilesMatch "^cloudkitty-api$">
+ Require all granted
+ </FilesMatch>
</Directory>
</VirtualHost>