openstack/openstack-ansible-os_cloudkitty
Code Issues Proposed changes

Merge "Deprecate rpc_backend option"

Browse Source
This commit is contained in:
Jenkins 2017-06-08 21:29:51 +00:00 committed by Gerrit Code Review
commit 9b64ba6b11
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@ -120,5 +120,4 @@ cloudkitty_role_project_group: cloudkitty_all
# The messaging driver to use, defaults to rabbit. Other drivers # The messaging driver to use, defaults to rabbit. Other drivers
# include qpid and zmq. (string value) # include qpid and zmq. (string value)
cloudkitty_rpc_backend: rabbit
cloudkitty_database_connection: "mysql+pymysql://{{ cloudkitty_galera_user }}:{{ cloudkitty_container_mysql_password }}@{{ cloudkitty_galera_address }}/{{ cloudkitty_galera_database }}?charset=utf8" cloudkitty_database_connection: "mysql+pymysql://{{ cloudkitty_galera_user }}:{{ cloudkitty_container_mysql_password }}@{{ cloudkitty_galera_address }}/{{ cloudkitty_galera_database }}?charset=utf8"

4
releasenotes/notes/remove_rpc_backend-1987334512353568.yaml Normal file
View File

@ -0,0 +1,4 @@
---
deprecations:
- Remove ``cloudkitty_rpc_backend`` option due to deprecation of
rpc_backend option in oslo.messaging.

9
templates/cloudkitty.conf.j2
View File

@ -5,7 +5,9 @@
use_stderr = False use_stderr = False
debug = {{ debug }} debug = {{ debug }}
notification_topics = {{ cloudkitty_notification_topics }} notification_topics = {{ cloudkitty_notification_topics }}
rpc_backend = {{ cloudkitty_rpc_backend }}
## RabbitMQ RPC
transport_url = rabbit://{% for host in cloudkitty_rabbitmq_servers.split(',') %}{{ cloudkitty_rabbitmq_userid }}:{{ cloudkitty_rabbitmq_password }}@{{ host }}:{{ cloudkitty_rabbitmq_port }}{% if not loop.last %},{% else %}/{{ cloudkitty_rabbitmq_vhost }}{% endif %}{% endfor %}
[api] [api]
port = {{ cloudkitty_service_port }} port = {{ cloudkitty_service_port }}
@ -45,12 +47,7 @@ auth_section = keystone_authtoken
[oslo_messaging_qpid] [oslo_messaging_qpid]
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
rabbit_userid = {{ cloudkitty_rabbitmq_userid }}
rabbit_password = {{ cloudkitty_rabbitmq_password }}
rabbit_hosts = {{ cloudkitty_rabbitmq_servers }}
rabbit_virtual_host = {{ cloudkitty_rabbitmq_vhost }}
ssl = {{ cloudkitty_rabbitmq_use_ssl }} ssl = {{ cloudkitty_rabbitmq_use_ssl }}
rabbit_port = {{ cloudkitty_rabbitmq_port }}
[output] [output]
pipeline = {{ cloudkitty_output_pipeline }} pipeline = {{ cloudkitty_output_pipeline }}