Updated from global requirements

Also slightly modified sample config, including default value
for packages_cache.

Change-Id: I43e294a7e2328e916aa8273d808cfcabd60f7024

etc/murano/murano.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
 
@@ -688,6 +679,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]
 
 #
@@ -781,7 +788,7 @@
 
 # Location (directory) for Murano package cache. (string
 # value)
-#packages_cache=/tmp/murano-packages-cache
+#packages_cache=<None>
 
 # Maximum application package size, Mb (integer value)
 #package_size_limit=5

murano/common/config.py

@@ -21,7 +21,6 @@ import logging.config
 import logging.handlers
 import os
 import sys
-import tempfile
 
 from oslo.config import cfg
 from paste import deploy
@@ -177,10 +176,8 @@ engine_opts = [
 metadata_dir = cfg.StrOpt('metadata-dir', default='./meta',
                           help='Metadata dir')
 
-temp_pkg_cache = os.path.join(tempfile.gettempdir(), 'murano-packages-cache')
-
 packages_opts = [
-    cfg.StrOpt('packages_cache', default=temp_pkg_cache,
+    cfg.StrOpt('packages_cache', default=None,
                help='Location (directory) for Murano package cache.'),
 
     cfg.IntOpt('package_size_limit', default=5,

murano/engine/package_loader.py

@@ -70,9 +70,12 @@ class ApiPackageLoader(PackageLoader):
 
     @staticmethod
     def _get_cache_directory():
-        directory = os.path.join(config.CONF.packages_opts.packages_cache,
+        base_directory = (
-                                 str(uuid.uuid4()))
+            config.CONF.packages_opts.packages_cache or
-        directory = os.path.abspath(directory)
+            os.path.join(tempfile.gettempdir(), 'murano-packages-cache')
+        )
+        directory = os.path.abspath(os.path.join(base_directory,
+                                                 str(uuid.uuid4())))
         os.makedirs(directory)
 
         LOG.debug('Cache for package loader is located at: %s' % directory)

requirements.txt

@@ -1,11 +1,14 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
 pbr>=0.6,!=0.7,<1.0
 Babel>=1.3
-SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
+SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
-alembic>=0.4.1
+alembic>=0.6.4
 anyjson>=0.3.3
-eventlet>=0.13.0
+eventlet>=0.15.1
 PasteDeploy>=1.5.0
-Routes>=1.12.3
+Routes>=1.12.3,!=2.0
 WebOb>=1.2.3
 wsgiref>=0.1.2
 argparse
@@ -16,7 +19,7 @@ pycrypto>=2.6
 psutil>=1.1.1,<2.0.0
 iso8601>=0.1.9
 six>=1.7.0
-netaddr>=0.7.6
+netaddr>=0.7.12
 PyYAML>=3.1.0
 jsonpatch>=1.1
 keystonemiddleware>=1.0.0
@@ -26,13 +29,13 @@ Paste
 
 passlib
 jsonschema>=2.0.0,<3.0.0
-python-keystoneclient>=0.9.0
+python-keystoneclient>=0.10.0
 python-heatclient>=0.2.9
-python-neutronclient>=2.3.5,<3
+python-neutronclient>=2.3.6,<3
-oslo.db>=0.2.0 # Apache-2.0
+oslo.db>=1.0.0  # Apache-2.0
-oslo.config>=1.2.1
+oslo.config>=1.4.0  # Apache-2.0
-oslo.messaging>=1.3.0
+oslo.messaging>=1.4.0
 
 # not listed in global requirements
 yaql>=0.2.3,<0.3
-python-muranoclient>=0.5.2
+python-muranoclient>=0.5.5