From 66e8997c590523fdda22f6251a96bc08e001ae76 Mon Sep 17 00:00:00 2001
From: liyuenan <liyuenan@huawei.com>
Date: Mon, 16 Jan 2017 14:22:07 +0800
Subject: Support ceilometer for Newton CentOS

JIRA: COMPASS-518

The WSGIScriptAlias file should be "/var/www/cgi-bin/ceilometer/app".
This file is copied from
"/usr/lib/python2.7/site-packages/ceilometer/api/app.wsgi" in CentOS
or
"/usr/lib/python2.7/dist-packages/ceilometer/api/app.wsgi" in Ubuntu

Change-Id: Idcc37b0ed6c1d4c6e39d821a02a6579c57b6f035
Signed-off-by: liyuenan <liyuenan@huawei.com>
---
 .../tasks/ceilometer_config.yml                    | 24 +++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

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

diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/tasks/ceilometer_config.yml b/deploy/adapters/ansible/roles/ceilometer_controller/tasks/ceilometer_config.yml
index b2d58d4b..0a1b9735 100644
--- a/deploy/adapters/ansible/roles/ceilometer_controller/tasks/ceilometer_config.yml
+++ b/deploy/adapters/ansible/roles/ceilometer_controller/tasks/ceilometer_config.yml
@@ -16,6 +16,16 @@
     line: "Listen {{ internal_ip }}:8777"
   notify: restart apache server
 
+- name: create WSGIScriptAlias Path
+  file:
+    path: /var/www/cgi-bin/ceilometer
+    state: directory
+    mode: 0755
+
+- name: copy WSGIScriptAlias file
+  shell: |
+    cp {{WSGIScriptAlias_file}} /var/www/cgi-bin/ceilometer/app;
+
 - name: update apache2 configs
   template:
     src: wsgi-ceilometer.conf.j2
@@ -23,13 +33,6 @@
   when: ansible_os_family == 'Debian'
   notify: reload apache server
 
-- name: update apache2 configs
-  template:
-    src: wsgi-ceilometer.conf.j2
-    dest: '{{ apache_config_dir }}/ceilometer.conf'
-  when: ansible_os_family == 'RedHat'
-  notify: reload apache server
-
 - name: enable ceilometer server
   file:
     src: "{{ apache_config_dir }}/sites-available/ceilometer.conf"
@@ -38,6 +41,13 @@
   when: ansible_os_family == 'Debian'
   notify: reload apache server
 
+- name: update apache2 configs
+  template:
+    src: wsgi-ceilometer.conf.j2
+    dest: '{{ apache_config_dir }}/ceilometer.conf'
+  when: ansible_os_family == 'RedHat'
+  notify: reload apache server
+
 - name: copy glance & cinder configs
   template:
     src: "{{ item }}"
-- 
cgit 1.2.3-korg