more kitty changes

The cloudkitty.conf and defaults/main had some
incorrect info in it keeping kitty from working
correctly with keystone v3
This commit is contained in:
Michael Rice
2016-05-16 11:11:48 -05:00
parent 787634eeb5
commit 76075abf71
2 changed files with 7 additions and 11 deletions

View File

@@ -17,6 +17,7 @@ cloudkitty_user_password: secrete
cloudkitty_rabbitmq_userid: cloudkitty
cloudkitty_rabbitmq_password: secrete
cloudkitty_rabbitmq_vhost: /cloudkitty
cloudkitty_system_group_name: cloudkitty
cloudkitty_system_user_name: cloudkitty
@@ -45,7 +46,7 @@ cloudkitty_developer_constraints:
- "git+{{ cloudkitty_git_repo }}@{{ cloudkitty_requirements_git_install_branch }}#egg=cloudkitty"
cloudkitty_developer_mode: false
cloudkitty_notification_topics: openstack
cloudkitty_notification_topics: notifications
cloudkitty_services: compute
cloudkitty_collector: ceilometer
cloudkitty_project_name: admin

View File

@@ -32,7 +32,8 @@ auth_url = {{ keystone_service_adminurl }}
auth_type = {{ cloudkitty_keystone_auth_plugin }}
[keystone_fetcher]
auth_section = authinfos
keystone_version = 3
auth_section = keystone_authtoken
[matchmaker_redis]
@@ -46,6 +47,8 @@ auth_section = authinfos
rabbit_userid = {{ cloudkitty_rabbitmq_userid }}
rabbit_password = {{ cloudkitty_rabbitmq_password }}
rabbit_hosts = {{ rabbitmq_servers }}
rabbit_virtual_host = {{ cloudkitty_rabbitmq_vhost }}
rabbit_use_ssl = {{ rabbitmq_use_ssl }}
[output]
pipeline = {{ cloudkitty_output_pipline }}
@@ -58,14 +61,6 @@ backend = {{ cloudkitty_output_backend }}
[tenant_fetcher]
[authinfos]
debug = {{ debug }}
region_name = {{ service_region }}
tenant_name = service
password = {{ cloudkitty_user_password }}
username = {{ cloudkitty_username }}
auth_url = {{ keystone_service_adminurl }}
auth_plugin = {{ cloudkitty_keystone_trustee_auth_plugin }}
[ceilometer_collector]
auth_section = authinfos
auth_section = keystone_authtoken