Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop

src/risotto/config.py

@@ -84,6 +84,10 @@ if 'TMP_DIR' in environ:
     TMP_DIR = environ['TMP_DIR']
 else:
     TMP_DIR = config.get('TMP_DIR', '/tmp')
+if 'IMAGE_PATH' in environ:
+    IMAGE_PATH = environ['IMAGE_PATH']
+else:
+    IMAGE_PATH = config.get('IMAGE_PATH', '/tmp')
 
 
 def dsn_factory(database, user, password, address=DB_ADDRESS):
@@ -112,7 +116,8 @@ _config = {'database': {'dsn': dsn_factory(RISOTTO_DB_NAME, RISOTTO_DB_USER, RIS
            'submodule': {'allow_insecure_https': False,
                          'pki': '192.168.56.112'},
            'provider': {'factory_configuration_filename': 'infra.json',
-                        'packer_filename': 'recipe.json'},
+                        'packer_filename': 'recipe.json',
+                        'risotto_images_dir': IMAGE_PATH},
            }