From 3088bf5d0eb68b1f61ae218f9c594f87d514cb65 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Mon, 26 Mar 2018 15:14:48 +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. No need to copied it to
/var/www/cgi-bin/aodh folder.

Change-Id: Iacb08fba8a238c3d4ef075aa58d38b439409b2f5
---
 .../roles/aodh/templates/wsgi-aodh.conf.j2    | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/ansible/roles/aodh/templates/wsgi-aodh.conf.j2 b/ansible/roles/aodh/templates/wsgi-aodh.conf.j2
index d9f408099e..e0e68127a4 100644
--- a/ansible/roles/aodh/templates/wsgi-aodh.conf.j2
+++ b/ansible/roles/aodh/templates/wsgi-aodh.conf.j2
@@ -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 binary_path = '/usr/bin' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
 Listen {{ api_interface_address }}:{{ aodh_api_port }}
 
 ServerSignature Off
 ServerTokens Prod
 TraceEnable off
 
+<Directory "{{ binary_path }}">
+    <FilesMatch "^aodh-api$">
+      Options Indexes FollowSymLinks MultiViews
+      AllowOverride None
+      Require all granted
+    </FilesMatch>
+</Directory>
+
 <VirtualHost *:{{ aodh_api_port }}>
-
-  ## 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
-    AllowOverride None
-    Require all granted
-  </Directory>
-
   ## Logging
   ErrorLog "/var/log/kolla/aodh/aodh_wsgi_error.log"
   ServerSignature Off
@@ -26,5 +23,5 @@ TraceEnable off
   WSGIApplicationGroup %{GLOBAL}
   WSGIDaemonProcess aodh group=aodh processes={{ openstack_service_workers }} threads=1 user=aodh python-path={{ python_path }}
   WSGIProcessGroup aodh
-  WSGIScriptAlias / "/var/www/cgi-bin/aodh/app.wsgi"
+  WSGIScriptAlias / "{{ binary_path }}/aodh-api"
 </VirtualHost>