summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/ceilometer_controller
diff options
context:
space:
mode:
authorcarey.xu <carey.xuhan@huawei.com>2015-12-24 11:08:14 +0800
committercarey.xu <carey.xuhan@huawei.com>2015-12-24 11:08:14 +0800
commit8e4418400bd3a45b751dc5a8867a0a53a9290ef8 (patch)
tree447d13b94f68d7e1aabe3ce586e819cf033ea2c0 /deploy/adapters/ansible/roles/ceilometer_controller
parent6447ed5fe06bba5b973ba673780235d33c909302 (diff)
bugfix: compass4nfv support ceilometer
JIRA: COMPASS-53 Change-Id: Ibc4203074009bdbde5d29849538e0a0bebb832bb Signed-off-by: carey.xu <carey.xuhan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/ceilometer_controller')
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.yml2
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j223
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_controller/templates/cinder.j21
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_controller/templates/glance.j22
4 files changed, 21 insertions, 7 deletions
diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.yml b/deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.yml
index 98ac1274..a6ee0000 100644
--- a/deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/ceilometer_controller/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_controller/templates/ceilometer.j2 b/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2
index c2993885..b262a26b 100644
--- a/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2
+++ b/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2
@@ -1,26 +1,37 @@
[DEFAULT]
rpc_backend = rabbit
+auth_strategy = keystone
+verbose = True
+
+[oslo_messaging_rabbit]
rabbit_host = {{ internal_vip.ip }}
rabbit_userid = {{ RABBIT_USER }}
rabbit_password = {{ RABBIT_PASS }}
-auth_strategy = keystone
-verbose = True
[database]
connection = mongodb://ceilometer:{{ CEILOMETER_DBPASS }}@{{ internal_vip.ip }}:27017/ceilometer
[keystone_authtoken]
-auth_uri = http://{{ internal_vip.ip }}:5000/v2.0
+auth_uri = http://{{ internal_vip.ip }}:5000
+auth_url = http://{{ internal_vip.ip }}:35357
identity_uri = http://{{ internal_vip.ip }}:35357
-admin_tenant_name = service
-admin_user = ceilometer
-admin_password = {{ CEILOMETER_PASS }}
+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
[publisher]
metering_secret = {{ metering_secret }}
+
+[api]
+host = {{ internal_ip }}
diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/templates/cinder.j2 b/deploy/adapters/ansible/roles/ceilometer_controller/templates/cinder.j2
index 390bd870..dfd04739 100644
--- a/deploy/adapters/ansible/roles/ceilometer_controller/templates/cinder.j2
+++ b/deploy/adapters/ansible/roles/ceilometer_controller/templates/cinder.j2
@@ -1,3 +1,2 @@
[DEFAULT]
-control_exchange = cinder
notification_driver = messagingv2
diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/templates/glance.j2 b/deploy/adapters/ansible/roles/ceilometer_controller/templates/glance.j2
index 616e7e05..a513d2c1 100644
--- a/deploy/adapters/ansible/roles/ceilometer_controller/templates/glance.j2
+++ b/deploy/adapters/ansible/roles/ceilometer_controller/templates/glance.j2
@@ -1,6 +1,8 @@
[DEFAULT]
notification_driver = messagingv2
rpc_backend = rabbit
+
+[oslo_messaging_rabbit]
rabbit_host = {{ internal_vip.ip }}
rabbit_userid = {{ RABBIT_USER }}
rabbit_password = {{ RABBIT_PASS }}