From 8e4418400bd3a45b751dc5a8867a0a53a9290ef8 Mon Sep 17 00:00:00 2001 From: "carey.xu" Date: Thu, 24 Dec 2015 11:08:14 +0800 Subject: bugfix: compass4nfv support ceilometer JIRA: COMPASS-53 Change-Id: Ibc4203074009bdbde5d29849538e0a0bebb832bb Signed-off-by: carey.xu --- .../ansible/roles/ceilometer_compute/tasks/main.yml | 2 ++ .../roles/ceilometer_compute/templates/ceilometer.j2 | 13 +++++++++++++ 2 files changed, 15 insertions(+) (limited to 'deploy/adapters/ansible/roles/ceilometer_compute') diff --git a/deploy/adapters/ansible/roles/ceilometer_compute/tasks/main.yml b/deploy/adapters/ansible/roles/ceilometer_compute/tasks/main.yml index 98ac1274..a6ee0000 100644 --- a/deploy/adapters/ansible/roles/ceilometer_compute/tasks/main.yml +++ b/deploy/adapters/ansible/roles/ceilometer_compute/tasks/main.yml @@ -19,3 +19,5 @@ - name: write services to monitor list lineinfile: dest=/opt/service create=yes line='{{ item }}' with_items: ceilometer_services + +- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2 b/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2 index 716317da..ee78de01 100644 --- a/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2 +++ b/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2 @@ -1,6 +1,9 @@ [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 }} @@ -8,6 +11,16 @@ 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 -- cgit 1.2.3-korg