Merge "Updated from global requirements"

etc/ironic/ironic.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
 
@@ -156,15 +152,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
 
@@ -997,6 +984,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

@@ -1,6 +1,6 @@
 pbr>=0.6,!=0.7,<1.0
-SQLAlchemy>=0.8.4,!=0.9.5,<=0.9.99
-alembic>=0.6.2
+SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
+alembic>=0.6.4
 anyjson>=0.3.3
 argparse
 eventlet>=0.13.0
@@ -21,14 +21,14 @@ python-swiftclient>=2.0.2
 stevedore>=0.14
 pysendfile==2.0.0
 websockify>=0.5.1,<0.6
-oslo.config>=1.2.1
+oslo.config>=1.4.0.0a3
 oslo.db>=0.2.0  # Apache-2.0
-oslo.rootwrap
+oslo.rootwrap>=1.3.0.0a1
 oslo.i18n>=0.1.0  # Apache-2.0
-pecan>=0.4.5
+pecan>=0.5.0
 six>=1.7.0
 jsonpatch>=1.1
 WSME>=0.6
 Jinja2
-oslo.messaging>=1.3.0
-retrying>=1.2.2
+oslo.messaging>=1.4.0.0a3
+retrying>=1.2.2 # Apache-2.0