From 42634c9d279f6c1db38e0926a787fc33c2ef826f Mon Sep 17 00:00:00 2001
From: Harry Huang <huangxiangyu5@huawei.com>
Date: Tue, 7 Feb 2017 18:48:49 +0800
Subject: Fix Aodh Bug

JIRA: COMPASS-522

Bug:
Connection error happens when using aodh command.
Curl aodh-api also returns empty reply.

Solution:
Use apache to be aodh api server. Disable aodh-api
service. Delete aodh-api restart in ext-network role
to avoid aodh-api start again.

Change-Id: I04a4af38325bcbe4a0b86ec3d3beb7c9f3abd73b
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
---
 .../ansible/roles/aodh/templates/wsgi-aodh.conf.j2 | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 deploy/adapters/ansible/roles/aodh/templates/wsgi-aodh.conf.j2

(limited to 'deploy/adapters/ansible/roles/aodh/templates')

diff --git a/deploy/adapters/ansible/roles/aodh/templates/wsgi-aodh.conf.j2 b/deploy/adapters/ansible/roles/aodh/templates/wsgi-aodh.conf.j2
new file mode 100644
index 00000000..8d71075e
--- /dev/null
+++ b/deploy/adapters/ansible/roles/aodh/templates/wsgi-aodh.conf.j2
@@ -0,0 +1,28 @@
+{% set work_threads = (ansible_processor_vcpus + 1) // 2 %}
+{% if work_threads > 10 %}
+{%  set work_threads = 10 %}
+{% endif %}
+
+<VirtualHost {{ internal_ip }}:8042>
+    WSGIDaemonProcess aodh-api processes=4 threads={{ work_threads }} user=aodh group=aodh display-name=%{GROUP}
+    WSGIProcessGroup aodh-api
+    WSGIScriptAlias / /var/www/cgi-bin/aodh/app
+    WSGIApplicationGroup %{GLOBAL}
+    <IfVersion >= 2.4>
+        ErrorLogFormat "%{cu}t %M"
+    </IfVersion>
+    ErrorLog /var/log/{{ http_service_name }}/aodh.log
+    CustomLog /var/log/{{ http_service_name }}/aodh_access.log combined
+
+    <Directory /usr/lib/python2.7/dist-packages/aodh/api/>
+        <IfVersion >= 2.4>
+            Require all granted
+        </IfVersion>
+        <IfVersion < 2.4>
+            Order allow,deny
+            Allow from all
+        </IfVersion>
+    </Directory>
+</VirtualHost>
+
+WSGISocketPrefix /var/run/{{ http_service_name }}
-- 
cgit 1.2.3-korg