diff --git a/etc/trove/trove-conductor.conf.sample b/etc/trove/trove-conductor.conf.sample
index a267479704..48ca07ce79 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,34 +21,6 @@ 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 ===============================
-
-# 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=/
-
-# The manager class to use for conductor. (string value)
-conductor_manager = trove.conductor.manager.Manager
-
 [profiler]
 # If False fully disable profiling feature.
 #enabled = False
@@ -54,3 +29,32 @@ conductor_manager = trove.conductor.manager.Manager
 
 [database]
 connection = mysql://root:e1a2c042c828d3566d0a@localhost/trove
+
+[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=/
diff --git a/etc/trove/trove-guestagent.conf.sample b/etc/trove/trove-guestagent.conf.sample
index 09f89d2af7..64f916dcc3 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 3b5b316a26..1fb6f35adc 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 1937c00217..8df5d7dfea 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 ec26ed39e7..b762354d3b 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