diff options
author | Doug Shelley <doug@parelastic.com> | 2015-12-21 19:21:06 -0500 |
---|---|---|
committer | Doug Shelley <doug@parelastic.com> | 2015-12-22 10:35:25 -0500 |
commit | 4be983e42ecd09106d30d8f9f2620bd6e0d5a433 (patch) | |
tree | 94ec0873c90bbc595fba86fa77f710d8c276322a /etc/trove | |
parent | 6490a6fed079bb53f166f02be72f03e9c49ca801 (diff) | |
download | trove-4be983e42ecd09106d30d8f9f2620bd6e0d5a433.tar.gz |
Move rabbit conf settings to separate section
oslo.messaging has deprecated the use of messaging config settings,
specifically rabbit_* settings, in the [DEFAULT] section. This commit
moves the rabbit settings to a [oslo_messaging_rabbit] section in
each of the relevant trove service sample config files.
Change-Id: Ia869768102a8a841313cd7e0fd8a9fdab257d3e3
Closes-Bug: #1528391
Diffstat (limited to 'etc/trove')
-rw-r--r-- | etc/trove/trove-conductor.conf.sample | 38 | ||||
-rw-r--r-- | etc/trove/trove-guestagent.conf.sample | 55 | ||||
-rw-r--r-- | etc/trove/trove-taskmanager.conf.sample | 54 | ||||
-rw-r--r-- | etc/trove/trove.conf.sample | 54 | ||||
-rw-r--r-- | etc/trove/trove.conf.test | 9 |
5 files changed, 113 insertions, 97 deletions
diff --git a/etc/trove/trove-conductor.conf.sample b/etc/trove/trove-conductor.conf.sample index a2674797..48ca07ce 100644 --- a/etc/trove/trove-conductor.conf.sample +++ b/etc/trove/trove-conductor.conf.sample @@ -3,6 +3,9 @@ verbose = True debug = True trove_auth_url = http://0.0.0.0:5000/v2.0 +# The manager class to use for conductor. (string value) +conductor_manager = trove.conductor.manager.Manager + #===================== RPC Configuration ================================= # URL representing the messaging driver to use and its full configuration. @@ -18,39 +21,40 @@ trove_auth_url = http://0.0.0.0:5000/v2.0 # overridden by an exchange name specified in the 'transport_url option. control_exchange = trove -# ================ RabbitMQ Configuration =============================== +[profiler] +# If False fully disable profiling feature. +#enabled = False +# If False doesn't trace SQL requests. +#trace_sqlalchemy = True + +[database] +connection = mysql://root:e1a2c042c828d3566d0a@localhost/trove -# The RabbitMQ broker address where a single node is used. -# (string value) +[oslo_messaging_rabbit] +# The RabbitMQ broker address where a single node is used. (string value) +# Deprecated group/name - [DEFAULT]/rabbit_host #rabbit_host=localhost -# The RabbitMQ broker port where a single node is used. -# (integer value) +# The RabbitMQ broker port where a single node is used. (integer value) +# Deprecated group/name - [DEFAULT]/rabbit_port #rabbit_port=5672 # RabbitMQ HA cluster host:port pairs. (list value) +# Deprecated group/name - [DEFAULT]/rabbit_hosts #rabbit_hosts=$rabbit_host:$rabbit_port # Connect over SSL for RabbitMQ. (boolean value) +# Deprecated group/name - [DEFAULT]/rabbit_use_ssl #rabbit_use_ssl=false # The RabbitMQ userid. (string value) +# Deprecated group/name - [DEFAULT]/rabbit_userid #rabbit_userid=guest # The RabbitMQ password. (string value) +# Deprecated group/name - [DEFAULT]/rabbit_password rabbit_password=f7999d1955c5014aa32c # The RabbitMQ virtual host. (string value) +# Deprecated group/name - [DEFAULT]/rabbit_virtual_host #rabbit_virtual_host=/ - -# The manager class to use for conductor. (string value) -conductor_manager = trove.conductor.manager.Manager - -[profiler] -# If False fully disable profiling feature. -#enabled = False -# If False doesn't trace SQL requests. -#trace_sqlalchemy = True - -[database] -connection = mysql://root:e1a2c042c828d3566d0a@localhost/trove diff --git a/etc/trove/trove-guestagent.conf.sample b/etc/trove/trove-guestagent.conf.sample index 09f89d2a..64f916dc 100644 --- a/etc/trove/trove-guestagent.conf.sample +++ b/etc/trove/trove-guestagent.conf.sample @@ -16,33 +16,6 @@ # overridden by an exchange name specified in the 'transport_url option. control_exchange = trove - -# ========== Sample RabbitMQ Configuration ========== - -# The RabbitMQ broker address where a single node is used. -# (string value) -rabbit_host=10.0.0.1 - -# The RabbitMQ broker port where a single node is used. -# (integer value) -# rabbit_port=5672 - -# RabbitMQ HA cluster host:port pairs. (list value) -# rabbit_hosts=$rabbit_host:$rabbit_port - -# Connect over SSL for RabbitMQ. (boolean value) -# rabbit_use_ssl=false - -# The RabbitMQ userid. (string value) -# rabbit_userid=guest - -# The RabbitMQ password. (string value) -rabbit_password=f7999d1955c5014aa32c - -# The RabbitMQ virtual host. (string value) -# rabbit_virtual_host=/ - - # ========== Configuration options for Swift ========== # The swift_url can be specified directly or fetched from Keystone catalog. @@ -111,6 +84,34 @@ log_file = logfile.txt # If False doesn't trace SQL requests. #trace_sqlalchemy = True +[oslo_messaging_rabbit] +# The RabbitMQ broker address where a single node is used. (string value) +# Deprecated group/name - [DEFAULT]/rabbit_host +rabbit_host=10.0.0.1 + +# The RabbitMQ broker port where a single node is used. (integer value) +# Deprecated group/name - [DEFAULT]/rabbit_port +#rabbit_port=5672 + +# RabbitMQ HA cluster host:port pairs. (list value) +# Deprecated group/name - [DEFAULT]/rabbit_hosts +#rabbit_hosts=$rabbit_host:$rabbit_port + +# Connect over SSL for RabbitMQ. (boolean value) +# Deprecated group/name - [DEFAULT]/rabbit_use_ssl +#rabbit_use_ssl=false + +# The RabbitMQ userid. (string value) +# Deprecated group/name - [DEFAULT]/rabbit_userid +#rabbit_userid=guest + +# The RabbitMQ password. (string value) +# Deprecated group/name - [DEFAULT]/rabbit_password +rabbit_password=f7999d1955c5014aa32c + +# The RabbitMQ virtual host. (string value) +# Deprecated group/name - [DEFAULT]/rabbit_virtual_host +#rabbit_virtual_host=/ # ========== Datastore Specific Configuration Options ========== diff --git a/etc/trove/trove-taskmanager.conf.sample b/etc/trove/trove-taskmanager.conf.sample index 3b5b316a..1fb6f35a 100644 --- a/etc/trove/trove-taskmanager.conf.sample +++ b/etc/trove/trove-taskmanager.conf.sample @@ -26,31 +26,6 @@ update_status_on_fail = True # overridden by an exchange name specified in the 'transport_url option. control_exchange = trove -# ================ RabbitMQ Configuration =========================== - -# The RabbitMQ broker address where a single node is used. -# (string value) -#rabbit_host=localhost - -# The RabbitMQ broker port where a single node is used. -# (integer value) -#rabbit_port=5672 - -# RabbitMQ HA cluster host:port pairs. (list value) -#rabbit_hosts=$rabbit_host:$rabbit_port - -# Connect over SSL for RabbitMQ. (boolean value) -#rabbit_use_ssl=false - -# The RabbitMQ userid. (string value) -#rabbit_userid=guest - -# The RabbitMQ password. (string value) -rabbit_password=f7999d1955c5014aa32c - -# The RabbitMQ virtual host. (string value) -#rabbit_virtual_host=/ - #DB Api Implementation db_api_implementation = trove.db.sqlalchemy.api @@ -214,6 +189,35 @@ idle_timeout = 3600 # If False doesn't trace SQL requests. #trace_sqlalchemy = True +[oslo_messaging_rabbit] +# The RabbitMQ broker address where a single node is used. (string value) +# Deprecated group/name - [DEFAULT]/rabbit_host +#rabbit_host=localhost + +# The RabbitMQ broker port where a single node is used. (integer value) +# Deprecated group/name - [DEFAULT]/rabbit_port +#rabbit_port=5672 + +# RabbitMQ HA cluster host:port pairs. (list value) +# Deprecated group/name - [DEFAULT]/rabbit_hosts +#rabbit_hosts=$rabbit_host:$rabbit_port + +# Connect over SSL for RabbitMQ. (boolean value) +# Deprecated group/name - [DEFAULT]/rabbit_use_ssl +#rabbit_use_ssl=false + +# The RabbitMQ userid. (string value) +# Deprecated group/name - [DEFAULT]/rabbit_userid +#rabbit_userid=guest + +# The RabbitMQ password. (string value) +# Deprecated group/name - [DEFAULT]/rabbit_password +rabbit_password=f7999d1955c5014aa32c + +# The RabbitMQ virtual host. (string value) +# Deprecated group/name - [DEFAULT]/rabbit_virtual_host +#rabbit_virtual_host=/ + [mysql] # Format (single port or port range): A, B-C # where C greater than B diff --git a/etc/trove/trove.conf.sample b/etc/trove/trove.conf.sample index 1937c002..8df5d7df 100644 --- a/etc/trove/trove.conf.sample +++ b/etc/trove/trove.conf.sample @@ -30,31 +30,6 @@ bind_port = 8779 # overridden by an exchange name specified in the 'transport_url option. control_exchange = trove -# ==================== RabbitMQ Configuration ======================= - -# The RabbitMQ broker address where a single node is used. -# (string value) -#rabbit_host=localhost - -# The RabbitMQ broker port where a single node is used. -# (integer value) -#rabbit_port=5672 - -# RabbitMQ HA cluster host:port pairs. (list value) -#rabbit_hosts=$rabbit_host:$rabbit_port - -# Connect over SSL for RabbitMQ. (boolean value) -#rabbit_use_ssl=false - -# The RabbitMQ userid. (string value) -#rabbit_userid=guest - -# The RabbitMQ password. (string value) -rabbit_password=f7999d1955c5014aa32c - -# The RabbitMQ virtual host. (string value) -#rabbit_virtual_host=/ - # Maximum line size of message headers to be accepted. # max_header_line may need to be increased when using large tokens # (typically those generated by the Keystone v3 API with big service @@ -207,6 +182,35 @@ idle_timeout = 3600 #optional: #ca_file = /path/to/ca_file +[oslo_messaging_rabbit] +# The RabbitMQ broker address where a single node is used. (string value) +# Deprecated group/name - [DEFAULT]/rabbit_host +#rabbit_host=localhost + +# The RabbitMQ broker port where a single node is used. (integer value) +# Deprecated group/name - [DEFAULT]/rabbit_port +#rabbit_port=5672 + +# RabbitMQ HA cluster host:port pairs. (list value) +# Deprecated group/name - [DEFAULT]/rabbit_hosts +#rabbit_hosts=$rabbit_host:$rabbit_port + +# Connect over SSL for RabbitMQ. (boolean value) +# Deprecated group/name - [DEFAULT]/rabbit_use_ssl +#rabbit_use_ssl=false + +# The RabbitMQ userid. (string value) +# Deprecated group/name - [DEFAULT]/rabbit_userid +#rabbit_userid=guest + +# The RabbitMQ password. (string value) +# Deprecated group/name - [DEFAULT]/rabbit_password +rabbit_password=f7999d1955c5014aa32c + +# The RabbitMQ virtual host. (string value) +# Deprecated group/name - [DEFAULT]/rabbit_virtual_host +#rabbit_virtual_host=/ + [mysql] root_on_create = False # Format (single port or port range): A, B-C diff --git a/etc/trove/trove.conf.test b/etc/trove/trove.conf.test index ec26ed39..b762354d 100644 --- a/etc/trove/trove.conf.test +++ b/etc/trove/trove.conf.test @@ -38,9 +38,6 @@ bind_port = 8779 # be the number of CPUs available. (integer value) #trove_api_workers=None -# AMQP Connection info -rabbit_password=f7999d1955c5014aa32c - #DB Api Implementation db_api_implementation = trove.db.sqlalchemy.api @@ -118,6 +115,12 @@ control_exchange = trove paste_config_file=api-paste.ini.test +[oslo_messaging_rabbit] +# AMQP Connection info +# Deprecated group/name - [DEFAULT]/rabbit_password +rabbit_password=f7999d1955c5014aa32c + + [mysql] volume_support = True device_path = /dev/vdb |