Manually update requirements to oslo.messaging

Update requirements for oslo.messaging 1.4 and regenerate config file,
where redis options has been fixed again. It will unblock the global
requirement sync job.

Related-Bug: #1332588
Change-Id: I0d1dc758504e76131738614ccd429171b7c40df1

etc/heat/heat.conf.sample

@@ -159,10 +159,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
 
@@ -192,6 +188,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
@@ -301,15 +301,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
 
@@ -1229,6 +1220,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]
 
 #

requirements.txt

@@ -16,7 +16,7 @@ netaddr>=0.7.6
 oslo.config>=1.4.0.0a3
 oslo.db>=0.2.0  # Apache-2.0
 oslo.i18n>=0.2.0 # Apache-2.0
-oslo.messaging>=1.3.0
+oslo.messaging>=1.4.0.0a3
 PasteDeploy>=1.5.0
 posix_ipc
 pycrypto>=2.6