diff options
| author |   shuai chen <chenshuai@huawei.com> | 2015-12-25 00:49:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-12-25 00:49:32 +0000 |
| commit | 01338238984e899dc7274e03618c9e9998c63d96 (patch) | |
| tree | 4ecb2494b656d83bd9ff764be93554ee423368b2 /deploy/adapters/ansible/roles/ceilometer_compute | |
| parent | dc9d4399c9e68b8fc873387e4d4bc3499e21e304 (diff) | |
| parent | 8e4418400bd3a45b751dc5a8867a0a53a9290ef8 (diff) | |
Merge "bugfix: compass4nfv support ceilometer"
Diffstat (limited to 'deploy/adapters/ansible/roles/ceilometer_compute')
| -rw-r--r-- | deploy/adapters/ansible/roles/ceilometer_compute/tasks/main.yml | 2 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2 | 13 |
2 files changed, 15 insertions, 0 deletions
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 |