openstack
/
trove
Code Issues Proposed changes

Using consistent control_exchange option for rpc 

With oslo.messsaging adoption [0], trove config template files contain
some inconsistent and duplicated control_exchange option.

[0] Change Ibd886f3cb4a45250c7c434b3af711abee266671c

Change-Id: I024101edee1cf074181e8d58e69033bc509b582c
Signed-off-by: Zhi Yan Liu <zhiyanl@cn.ibm.com>
This commit is contained in:
Zhi Yan Liu 2015-01-07 22:31:20 +08:00
parent 109ba58680
commit 9f2db96e7e
4 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/trove/trove-conductor.conf.sample
View File

@ -1,7 +1,6 @@
[DEFAULT]
verbose = True
debug = True
control_exchange = trove
trove_auth_url = http://0.0.0.0:5000/v2.0
sql_connection = mysql://root:e1a2c042c828d3566d0a@localhost/trove
@ -18,7 +17,7 @@ sql_connection = mysql://root:e1a2c042c828d3566d0a@localhost/trove
# The default exchange under which topics are scoped. May be
# overridden by an exchange name specified in the 'transport_url option.
#control_exchange=openstack
control_exchange = trove
# ================ RabbitMQ Configuration ===============================

8
etc/trove/trove-guestagent.conf.sample
View File

@ -13,7 +13,7 @@
# The default exchange under which topics are scoped. May be
# overridden by an exchange name specified in the 'transport_url option.
#control_exchange=openstack
control_exchange = trove
# ========== Sample RabbitMQ Configuration ==========
@ -93,12 +93,6 @@ root_grant_option = True
# backup_chunk_size = 65536
# backup_segment_max_size = 2147483648
# ========== Configuration for communication with trove-conductor ==========
# Control Exchange used to communicate with trove-conductor
control_exchange = trove
# ========== Sample Logging Configuration ==========
# Show more verbose log output (sets INFO log level output)

4
etc/trove/trove-taskmanager.conf.sample
View File

@ -24,7 +24,7 @@ update_status_on_fail = True
# The default exchange under which topics are scoped. May be
# overridden by an exchange name specified in the 'transport_url option.
#control_exchange=openstack
control_exchange = trove
# ================ RabbitMQ Configuration ===========================
@ -174,8 +174,6 @@ template_path = /etc/trove/templates/
# Topics used for OpenStack notifications, list value. Default is 'notifications'.
# notification_topics=['notifications', ]
control_exchange=trove
# ============ Logging information =============================
#log_dir = /integration/report
#log_file = trove-taskmanager.log

4
etc/trove/trove.conf.sample
View File

@ -28,7 +28,7 @@ bind_port = 8779
# The default exchange under which topics are scoped. May be
# overridden by an exchange name specified in the 'transport_url option.
#control_exchange=openstack
control_exchange = trove
# ==================== RabbitMQ Configuration =======================
@ -183,8 +183,6 @@ api_paste_config = api-paste.ini
# Topics used for OpenStack notifications, list value. Default is 'notifications'.
# notification_topics=['notifications', ]
control_exchange = trove
# ============ Logging information =============================
#log_dir = /integration/report
#log_file = trove-api.log