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>

diff --git a/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2 b/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2
deleted file mode 100644 (file)
index 275c991..0000000
--- a/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2
+++ /dev/null
@@ -1,31 +0,0 @@
-[DEFAULT]
-verbose = True
-rpc_backend = rabbit
-auth_strategy = keystone
-
-[oslo_messaging_rabbit]
-rabbit_host = {{ internal_vip.ip }}
-rabbit_userid = {{ RABBIT_USER }}
-rabbit_password = {{ RABBIT_PASS }}
-
-[publisher]
-metering_secret = {{ metering_secret }}
-
-[keystone_authtoken]
-auth_uri = http://{{ internal_vip.ip }}:5000
-auth_url = http://{{ internal_vip.ip }}:35357
-auth_plugin = password
-project_domain_id = default
-user_domain_id = default
-project_name = service
-username = ceilometer
-password = {{ CEILOMETER_PASS }}
-
-[service_credentials]
-os_auth_url = http://{{ internal_vip.ip }}:5000/v2.0
-os_username = ceilometer
-os_tenant_name = service
-os_password = {{ CEILOMETER_PASS }}
-os_endpoint_type = internalURL
-os_region_name = RegionOne
-

diff --git a/deploy/adapters/ansible/roles/ceilometer_compute/templates/nova.j2 b/deploy/adapters/ansible/roles/ceilometer_compute/templates/nova.j2
deleted file mode 100644 (file)
index e7532c8..0000000
--- a/deploy/adapters/ansible/roles/ceilometer_compute/templates/nova.j2
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-instance_usage_audit = True
-instance_usage_audit_period = hour
-notify_on_state_change = vm_and_task_state
-notification_driver = messagingv2

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 b2d58d4..0a1b973 100644 (file)
--- 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 }}"

diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/templates/wsgi-ceilometer.conf.j2 b/deploy/adapters/ansible/roles/ceilometer_controller/templates/wsgi-ceilometer.conf.j2
index c876efd..70ad817 100644 (file)
--- a/deploy/adapters/ansible/roles/ceilometer_controller/templates/wsgi-ceilometer.conf.j2
+++ b/deploy/adapters/ansible/roles/ceilometer_controller/templates/wsgi-ceilometer.conf.j2
@@ -6,7 +6,7 @@
 <VirtualHost {{ internal_ip }}:8777>
     WSGIDaemonProcess ceilometer-api processes=4 threads={{ work_threads }} user=ceilometer group=ceilometer display-name=%{GROUP}
     WSGIProcessGroup ceilometer-api
-    WSGIScriptAlias / {{ WSGIScriptAlias_path }}
+    WSGIScriptAlias / /var/www/cgi-bin/ceilometer/app
     WSGIApplicationGroup %{GLOBAL}
     ErrorLog /var/log/{{ http_service_name }}/ceilometer_error.log
     CustomLog /var/log/{{ http_service_name }}/ceilometer_access.log combined

diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml b/deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml
index 1456ee5..cf76113 100644 (file)
--- a/deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml
@@ -31,4 +31,4 @@ services:
 
 apache_config_dir: /etc/apache2
 http_service_name: apache2
-WSGIScriptAlias_path: /usr/lib/python2.7/dist-packages/ceilometer/api/app.wsgi
+WSGIScriptAlias_file: /usr/lib/python2.7/dist-packages/ceilometer/api/app.wsgi

diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/vars/RedHat.yml b/deploy/adapters/ansible/roles/ceilometer_controller/vars/RedHat.yml
index 08d1a92..f55e0e8 100644 (file)
--- a/deploy/adapters/ansible/roles/ceilometer_controller/vars/RedHat.yml
+++ b/deploy/adapters/ansible/roles/ceilometer_controller/vars/RedHat.yml
@@ -18,7 +18,6 @@ ceilometer_packages:
 ceilometer_services:
   - openstack-ceilometer-central
   - openstack-ceilometer-notification
-  - openstack-ceilometer-api
   - openstack-ceilometer-collector
 
 glance_cinder_services:
@@ -32,4 +31,4 @@ services:
 
 apache_config_dir: /etc/httpd/conf.d
 http_service_name: httpd
-WSGIScriptAlias_path: /usr/lib/python2.7/site-packages/ceilometer/api/app.wsgi
+WSGIScriptAlias_file: /usr/lib/python2.7/site-packages/ceilometer/api/app.wsgi