Integration with oslo.messaging library

Port Trove to use oslo messaging library instead of obsolete messaging code from oslo incubator. Change-Id: Ibd886f3cb4a45250c7c434b3af711abee266671c Implements: blueprint rpc-versioning
2014-09-07 11:45:23 +03:00
parent 3e56c2177b
commit ea148d7dfe
66 changed files with 862 additions and 6733 deletions
--- a/etc/trove/trove-conductor.conf.sample
+++ b/etc/trove/trove-conductor.conf.sample
@@ -5,6 +5,23 @@ control_exchange = trove
 trove_auth_url = http://0.0.0.0:5000/v2.0
 sql_connection = mysql://root:e1a2c042c828d3566d0a@localhost/trove

+#===================== RPC Configuration =================================
+
+# URL representing the messaging driver to use and its full configuration.
+# If not set, we fall back to the 'rpc_backend' option and driver specific
+# configuration.
+#transport_url=<None>
+
+# The messaging driver to use. Options include rabbit, qpid and zmq.
+# Default is rabbit. (string value)
+#rpc_backend=rabbit
+
+# The default exchange under which topics are scoped. May be
+# overridden by an exchange name specified in the 'transport_url option.
+#control_exchange=openstack
+
+# ================ RabbitMQ Configuration ===============================
+
 # The RabbitMQ broker address where a single node is used.
 # (string value)
 #rabbit_host=localhost
@@ -28,10 +45,5 @@ 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
-
 # The manager class to use for conductor. (string value)
 conductor_manager = trove.conductor.manager.Manager
--- a/etc/trove/trove-guestagent.conf.sample
+++ b/etc/trove/trove-guestagent.conf.sample
@@ -1,5 +1,20 @@
 [DEFAULT]

+#=========== RPC Configuration ======================
+
+# URL representing the messaging driver to use and its full configuration.
+# If not set, we fall back to the 'rpc_backend' option and driver specific
+# configuration.
+#transport_url=<None>
+
+# The messaging driver to use. Options include rabbit, qpid and zmq.
+# Default is rabbit. (string value)
+#rpc_backend=rabbit
+
+# The default exchange under which topics are scoped. May be
+# overridden by an exchange name specified in the 'transport_url option.
+#control_exchange=openstack
+
 # ========== Sample RabbitMQ Configuration ==========

 # The RabbitMQ broker address where a single node is used.
@@ -25,10 +40,6 @@ rabbit_password=f7999d1955c5014aa32c
 # The RabbitMQ virtual host. (string value)
 # rabbit_virtual_host=/

-# RabbitMQ topic used for OpenStack notifications. (list value)
-# rabbit_notification_topic = ['notifications']
-
-
 # ========== Configuration options for Swift ==========

 # The swift_url can be specified directly or fetched from Keystone catalog.
--- a/etc/trove/trove-taskmanager.conf.sample
+++ b/etc/trove/trove-taskmanager.conf.sample
@@ -11,6 +11,23 @@ debug = True
 # restore_usage_timeout = 36000
 update_status_on_fail = True

+#================= RPC Configuration ================================
+
+# URL representing the messaging driver to use and its full configuration.
+# If not set, we fall back to the 'rpc_backend' option and driver specific
+# configuration.
+#transport_url=<None>
+
+# The messaging driver to use. Options include rabbit, qpid and zmq.
+# Default is rabbit. (string value)
+#rpc_backend=rabbit
+
+# The default exchange under which topics are scoped. May be
+# overridden by an exchange name specified in the 'transport_url option.
+#control_exchange=openstack
+
+# ================ RabbitMQ Configuration ===========================
+
 # The RabbitMQ broker address where a single node is used.
 # (string value)
 #rabbit_host=localhost
@@ -34,11 +51,6 @@ 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
@@ -153,10 +165,15 @@ network_label_regex = ^private$
 # Datastore templates
 template_path = /etc/trove/templates/

-# ============ notifer queue kombu connection options ========================
+# ============ Notification System configuration ===========================
+
+# Sets the notification driver used by oslo.messaging. Options include
+# messaging, messagingv2, log and routing. Default is 'noop'
+# notification_driver=noop
+
+# Topics used for OpenStack notifications, list value. Default is 'notifications'.
+# notification_topics=['notifications', ]

-# usage notifications
-notification_driver=trove.openstack.common.notifier.rpc_notifier
 control_exchange=trove

 # ============ Logging information =============================
--- a/etc/trove/trove.conf.sample
+++ b/etc/trove/trove.conf.sample
@@ -15,6 +15,23 @@ bind_port = 8779
 # be the number of CPUs available. (integer value)
 #trove_api_workers=None

+#===================== RPC Configuration =================================
+
+# URL representing the messaging driver to use and its full configuration.
+# If not set, we fall back to the 'rpc_backend' option and driver specific
+# configuration.
+#transport_url=<None>
+
+# The messaging driver to use. Options include rabbit, qpid and zmq.
+# Default is rabbit. (string value)
+#rpc_backend=rabbit
+
+# The default exchange under which topics are scoped. May be
+# overridden by an exchange name specified in the 'transport_url option.
+#control_exchange=openstack
+
+# ==================== RabbitMQ Configuration =======================
+
 # The RabbitMQ broker address where a single node is used.
 # (string value)
 #rabbit_host=localhost
@@ -38,11 +55,6 @@ 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
@@ -162,7 +174,14 @@ reboot_time_out = 60
 api_paste_config = api-paste.ini


-# ============ notifer queue kombu connection options ========================
+# ============ Notification System configuration ===========================
+
+# Sets the notification driver used by oslo.messaging. Options include
+# messaging, messagingv2, log and routing. Default is 'noop'
+# notification_driver=noop
+
+# Topics used for OpenStack notifications, list value. Default is 'notifications'.
+# notification_topics=['notifications', ]

 control_exchange = trove

--- a/etc/trove/trove.conf.test
+++ b/etc/trove/trove.conf.test
@@ -7,7 +7,10 @@ remote_swift_client = trove.tests.fakes.swift.fake_create_swift_client
 remote_cinder_client = trove.tests.fakes.nova.fake_create_cinder_client

 # Fake out the RPC implementation
-rpc_backend = trove.common.rpc.impl_fake
+rpc_backend = fake
+
+# Skip running periodic tasks
+report_interval = 0

 # Fake out DNS.
 trove_dns_support = True