openstack
/
charm-ceilometer
Code Issues Proposed changes

fixes in config file

This commit is contained in:
yolanda.robla@canonical.com 2013-02-13 14:13:31 +01:00
parent d2a01ed024
commit c52c13cba4
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/ceilometer_utils.py
View File

@ -1,8 +1,8 @@
import os
import uuid
RABBIT_USER="nova"
RABBIT_VHOST="nova"
RABBIT_USER="ceilometer"
RABBIT_VHOST="ceilometer"
CEILOMETER_CONF="/etc/ceilometer/ceilometer.conf"
SHARED_SECRET = "/etc/ceilometer/secret.txt"

2
revision
View File

@ -1 +1 @@
32
35

6
templates/ceilometer.conf
View File

@ -7,9 +7,13 @@ metering_api_port={{ service_port }}
rabbit_host={{ rabbit_host }}
rabbit_port=5672
rabbit_userid={{ rabbit_userid }}
rabbit_pasword={{ rabbit_password }}
rabbit_password={{ rabbit_password }}
rabbit_virtual_host={{ rabbit_virtual_host }}
database_connection={{ db_connection }}
os_auth_url=http://{{ keystone_host }}:{{ keystone_port }}/v2.0
os_tenant_name = {{ keystone_os_tenant }}
os_username = {{ keystone_os_username }}
os_password = {{ keystone_os_password }}
[keystone_authtoken]
auth_host = {{ keystone_host }}