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/tasks/aodh_install.yml      | 45 +++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

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

diff --git a/deploy/adapters/ansible/roles/aodh/tasks/aodh_install.yml b/deploy/adapters/ansible/roles/aodh/tasks/aodh_install.yml
index 4b86f7fd..4e2e8655 100644
--- a/deploy/adapters/ansible/roles/aodh/tasks/aodh_install.yml
+++ b/deploy/adapters/ansible/roles/aodh/tasks/aodh_install.yml
@@ -21,8 +21,51 @@
     - restart aodh services
 
 - name: write services to monitor list
-  lineinfile: dest=/opt/service create=yes line='{{ item }}'
+  lineinfile: dest=/opt/service create=yes line={{ item }}
   with_items: "{{ services | union(services_noarch) }}"
 
 - name: remove default sqlite db
   shell: rm /var/lib/aodh/aodh.sqlite || touch aodh.sqllite.db.removed
+
+- name: disable aodh-api service
+  service: name={{ item }} state=stopped enabled=no
+  with_items: "{{ api_service }}"
+
+- name: add listen port
+  lineinfile:
+    dest: '{{ apache_config_dir }}/ports.conf'
+    regexp: "^Listen {{ internal_ip }}:8042"
+    line: "Listen {{ internal_ip }}:8042"
+  notify: aodh restart apache
+
+- name: create WSGIScriptAlias Path
+  file:
+    path: /var/www/cgi-bin/aodh
+    state: directory
+    mode: 0755
+
+- name: copy WSGIScriptAlias file
+  shell: |
+    cp {{WSGIScriptAlias_file}} /var/www/cgi-bin/aodh/app;
+
+- name: update apache2 configs
+  template:
+    src: wsgi-aodh.conf.j2
+    dest: '{{ apache_config_dir }}/sites-available/aodh.conf'
+  when: ansible_os_family == 'Debian'
+  notify: aodh reload apache
+
+- name: enable aodh server
+  file:
+    src: "{{ apache_config_dir }}/sites-available/aodh.conf"
+    dest: "{{ apache_config_dir }}/sites-enabled/aodh.conf"
+    state: "link"
+  when: ansible_os_family == 'Debian'
+  notify: aodh reload apache
+
+- name: update apache2 configs
+  template:
+    src: wsgi-aodh.conf.j2
+    dest: '{{ apache_config_dir }}/aodh.conf'
+  when: ansible_os_family == 'RedHat'
+  notify: aodh reload apache
-- 
cgit 1.2.3-korg