summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMarcin Piwowarczyk <m.piwowarczy@samsung.com>2018-10-12 11:20:17 +0200
committerMarcin Piwowarczyk <m.piwowarczy@samsung.com>2018-10-13 20:00:16 +0200
commitdc7303a1357ca2cfbcd34575d1051642ab1f2e78 (patch)
treee3f85dbd02de24a13562d48d3149326c35b587f2 /etc
parentc03ec0827687fba202f72f4d264ab70158604857 (diff)
downloadtrove-dc7303a1357ca2cfbcd34575d1051642ab1f2e78.tar.gz
Be compilance with latest oslo.messaging
Support for the [oslo_messaging_rabbit] section has been removed in oslo.messaging==9.0.0 package [1]. That's why integration tests failures on build devstack step. This is the moment where we need to use the transport_url directive in the [DEFAULT] section instead. Moreover rpc_backend property (which was used in trove to enable fake RPC backend) has been removed from DEFAULT section and API tests fails on TIME_OUT as they starts on rabbit RPC backend. Fake RPC can be now configured as described here [2]: transport_url = 'fake:/' [1] https://docs.openstack.org/releasenotes/oslo.messaging/unreleased.html [2] https://docs.openstack.org/oslo.messaging/latest/configuration/conffixture.html Change-Id: Id6c5a9198d5a213cb085407a1d8b534e7c755f69 Signed-off-by: Marcin Piwowarczyk <m.piwowarczy@samsung.com>
Diffstat (limited to 'etc')
-rw-r--r--etc/trove/trove-conductor.conf.sample29
-rw-r--r--etc/trove/trove-guestagent.conf.sample29
-rw-r--r--etc/trove/trove-taskmanager.conf.sample29
-rw-r--r--etc/trove/trove.conf.sample29
-rw-r--r--etc/trove/trove.conf.test8
5 files changed, 1 insertions, 123 deletions
diff --git a/etc/trove/trove-conductor.conf.sample b/etc/trove/trove-conductor.conf.sample
index d858bf25..8f634567 100644
--- a/etc/trove/trove-conductor.conf.sample
+++ b/etc/trove/trove-conductor.conf.sample
@@ -56,32 +56,3 @@ connection = mysql+pymysql://root:e1a2c042c828d3566d0a@localhost/trove
# message which failed to be delivered due to a recoverable
# error. 0 - No retry, -1 - indefinite (integer value)
#retry = -1
-
-[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 756e9ef2..8e49d4bb 100644
--- a/etc/trove/trove-guestagent.conf.sample
+++ b/etc/trove/trove-guestagent.conf.sample
@@ -110,35 +110,6 @@ log_config_append = /etc/trove/trove-logging-guestagent.conf
# error. 0 - No retry, -1 - indefinite (integer value)
#retry = -1
-[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 ==========
[mysql]
diff --git a/etc/trove/trove-taskmanager.conf.sample b/etc/trove/trove-taskmanager.conf.sample
index b48b3748..6821768c 100644
--- a/etc/trove/trove-taskmanager.conf.sample
+++ b/etc/trove/trove-taskmanager.conf.sample
@@ -208,35 +208,6 @@ idle_timeout = 3600
# error. 0 - No retry, -1 - indefinite (integer value)
#retry = -1
-[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]
# Whether to permit ICMP. default is False.
icmp = True
diff --git a/etc/trove/trove.conf.sample b/etc/trove/trove.conf.sample
index 011f5a6b..f6597b8a 100644
--- a/etc/trove/trove.conf.sample
+++ b/etc/trove/trove.conf.sample
@@ -205,35 +205,6 @@ idle_timeout = 3600
# error. 0 - No retry, -1 - indefinite (integer value)
#retry = -1
-[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 1694eb97..588a3742 100644
--- a/etc/trove/trove.conf.test
+++ b/etc/trove/trove.conf.test
@@ -7,7 +7,7 @@ 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 = fake
+transport_url = 'fake:/'
# Skip running periodic tasks
report_interval = 0
@@ -104,12 +104,6 @@ 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