From 182806887e16e03d0aed6e9fa3106f8edf1dd620 Mon Sep 17 00:00:00 2001
From: Eric Harney <eharney@redhat.com>
Date: Wed, 20 Aug 2014 11:27:16 -0400
Subject: [PATCH] Update oslo.config and oslo.messaging requirements

Need to land the sample config update with these
updates so that the global requirements update can
pass tests.

Change-Id: Iaae306f05098165d80a7398a22038b322e9f7935
---
 etc/cinder/cinder.conf.sample | 33 ++++++++++++++++++++-------------
 requirements.txt              |  6 +++---
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index c869af466..f133003e3 100644
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -14,10 +14,6 @@
 # Size of RPC connection pool. (integer value)
 #rpc_conn_pool_size=30
 
-# Modules of exceptions that are permitted to be recreated
-# upon receiving exception data from an rpc call. (list value)
-#allowed_rpc_exception_modules=oslo.messaging.exceptions,nova.exception,cinder.exception,exceptions
-
 # Qpid broker hostname. (string value)
 #qpid_hostname=localhost
 
@@ -47,6 +43,10 @@
 # Whether to disable the Nagle algorithm. (boolean value)
 #qpid_tcp_nodelay=true
 
+# The number of prefetched messages held by receiver. (integer
+# value)
+#qpid_receiver_capacity=1
+
 # The qpid topology version to use.  Version 1 is what was
 # originally used by impl_qpid.  Version 2 includes some
 # backwards-incompatible changes that allow broker federation
@@ -156,15 +156,6 @@
 # Heartbeat time-to-live. (integer value)
 #matchmaker_heartbeat_ttl=600
 
-# Host to locate redis. (string value)
-#host=127.0.0.1
-
-# Use this port to connect to redis host. (integer value)
-#port=6379
-
-# Password for Redis server (optional). (string value)
-#password=<None>
-
 # Size of RPC greenthread pool. (integer value)
 #rpc_thread_pool_size=64
 
@@ -2379,6 +2370,22 @@
 #hash_algorithms=md5
 
 
+[matchmaker_redis]
+
+#
+# Options defined in oslo.messaging
+#
+
+# Host to locate redis. (string value)
+#host=127.0.0.1
+
+# Use this port to connect to redis host. (integer value)
+#port=6379
+
+# Password for Redis server (optional). (string value)
+#password=<None>
+
+
 [matchmaker_ring]
 
 #
diff --git a/requirements.txt b/requirements.txt
index 4b302a30d..ba3ad773d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,9 +9,9 @@ keystonemiddleware>=1.0.0
 kombu>=2.4.8
 lxml>=2.3
 netaddr>=0.7.6
-oslo.config>=1.2.1
-oslo.db>=0.2.0
-oslo.messaging>=1.3.0
+oslo.config>=1.4.0.0a3
+oslo.db>=0.4.0  # Apache-2.0
+oslo.messaging>=1.4.0.0a3
 oslo.rootwrap>=1.3.0.0a1
 osprofiler>=0.3.0
 paramiko>=1.13.0
-- 
2.45.2