From 66e8997c590523fdda22f6251a96bc08e001ae76 Mon Sep 17 00:00:00 2001 From: liyuenan 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 --- .../ceilometer_compute/templates/ceilometer.j2 | 31 ---------------------- .../roles/ceilometer_compute/templates/nova.j2 | 5 ---- 2 files changed, 36 deletions(-) delete mode 100644 deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2 delete mode 100644 deploy/adapters/ansible/roles/ceilometer_compute/templates/nova.j2 (limited to 'deploy/adapters/ansible/roles/ceilometer_compute') 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 index 275c991a..00000000 --- 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 index e7532c85..00000000 --- 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 -- cgit 1.2.3-korg