Merge "fix default rabbitmq configuration values in sample cfgs"

etc/trove/trove-conductor.conf.sample

@@ -4,4 +4,31 @@ debug = True
 control_exchange = trove
 trove_auth_url = http://0.0.0.0:5000/v2.0
 sql_connection = mysql://root:e1a2c042c828d3566d0a@localhost/trove
-rabbit_password = f7999d1955c5014aa32c
+
+# 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=/
+
+# RabbitMQ topic used for OpenStack notifications. (list value)
+#rabbit_notification_topic = ['notifications']
+
+rpc_backend = trove.openstack.common.rpc.impl_kombu

etc/trove/trove-guestagent.conf.sample

@@ -11,9 +11,32 @@ bind_host = 0.0.0.0
 # Port the bind the API server to
 bind_port = 8778
 
-# AMQP Connection info
+# 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=/
+
+# RabbitMQ topic used for OpenStack notifications. (list value)
+#rabbit_notification_topic = ['notifications']
+
 # Path to the extensions
 api_extensions_path = trove/extensions/routes
 
@@ -43,10 +66,6 @@ root_grant_option = True
 # For communicating with trove-conductor
 control_exchange = trove
 
-# ============ kombu connection options ========================
-
-rabbit_host=10.0.0.1
-
 # ============ Logging information =============================
 log_dir = /tmp/
 log_file = logfile.txt

etc/trove/trove-taskmanager.conf.sample

@@ -8,9 +8,34 @@ debug = True
 # Updates service and instance task statuses if instance failed become active
 update_status_on_fail = False
 
-# AMQP Connection info
+# 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=/
+
+# RabbitMQ topic used for OpenStack notifications. (list value)
+#rabbit_notification_topic = ['notifications']
+
+rpc_backend = trove.openstack.common.rpc.impl_kombu
+
 # SQLAlchemy connection string for the reference implementation
 # registry server. Any valid SQLAlchemy connection string is fine.
 # See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
@@ -94,14 +119,6 @@ template_path = /etc/trove/templates/
 
 # ============ notifer queue kombu connection options ========================
 
-notifier_queue_hostname = localhost
-notifier_queue_userid = guest
-notifier_queue_password = guest
-notifier_queue_ssl = False
-notifier_queue_port = 5672
-notifier_queue_virtual_host = /
-notifier_queue_transport = memory
-
 # usage notifications
 notification_driver=trove.openstack.common.notifier.rpc_notifier
 control_exchange=trove

etc/trove/trove.conf.sample

@@ -14,9 +14,34 @@ bind_port = 8779
 # Number of child processes to run
 #trove_api_workers=5
 
-# AMQP Connection info
+# 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=/
+
+# RabbitMQ topic used for OpenStack notifications. (list value)
+#rabbit_notification_topic = ['notifications']
+
+rpc_backend = trove.openstack.common.rpc.impl_kombu
+
 # SQLAlchemy connection string for the reference implementation
 # registry server. Any valid SQLAlchemy connection string is fine.
 # See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
@@ -111,14 +136,6 @@ api_paste_config = api-paste.ini
 
 # ============ notifer queue kombu connection options ========================
 
-notifier_queue_hostname = localhost
-notifier_queue_userid = guest
-notifier_queue_password = guest
-notifier_queue_ssl = False
-notifier_queue_port = 5672
-notifier_queue_virtual_host = /
-notifier_queue_transport = memory
-
 control_exchange = trove
 
 # ============ Logging information =============================