From 5493594b5417316d0afb58791a90517f5ed4214f Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Wed, 7 Mar 2018 09:22:34 +0800
Subject: [PATCH] Error path of WSGIScriptAlias of panko for ubuntu

Error path[1] of WSGIScriptAlias of panko for ubuntu, the right path is
/usr/lib/python2.7/dist-packages/panko/api/app.wsgi.

[1]http://logs.openstack.org/02/504302/4/check/puppet-openstack-beaker-xenial/aeb24d6/job-output.txt.gz#_2018-02-28_00_39_06_878490

Change-Id: I87531e4e5ef80e704bae52ed36a6cdbb01d4cffa
Closes-Bug: #1753865
---
 ansible/roles/panko/templates/wsgi-panko.conf.j2 | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/ansible/roles/panko/templates/wsgi-panko.conf.j2 b/ansible/roles/panko/templates/wsgi-panko.conf.j2
index 8216b492af..b36a9249f3 100644
--- a/ansible/roles/panko/templates/wsgi-panko.conf.j2
+++ b/ansible/roles/panko/templates/wsgi-panko.conf.j2
@@ -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 binary_path = '/usr/bin' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
 Listen {{ api_interface_address }}:{{ panko_api_port }}
 
 ServerSignature Off
 ServerTokens Prod
 TraceEnable off
 
+<Directory "{{ binary_path }}">
+    <FilesMatch "^panko-api$">
+        Require all granted
+    </FilesMatch>
+</Directory>
+
 <VirtualHost *:{{ panko_api_port }}>
 
   ErrorLog "/var/log/kolla/panko/panko-api-error.log"
@@ -13,10 +20,6 @@ TraceEnable off
   WSGIApplicationGroup %{GLOBAL}
   WSGIDaemonProcess panko group=panko processes={{ openstack_service_workers }} threads=1 user=panko python-path={{ python_path }}
   WSGIProcessGroup panko
-  WSGIScriptAlias / "{{ python_path }}/panko/api/app.wsgi"
-
-  <Directory "{{ python_path }}/panko/api">
-        Require all granted
-  </Directory>
+  WSGIScriptAlias / "{{ binary_path }}/panko-api"
 
 </VirtualHost>