Infra
/
risotto
9
0
Fork 1
Code Issues 1 Releases Wiki Activity

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

This commit is contained in:
Emmanuel Garette 2020-09-19 10:33:34 +02:00
parent 0e988d7040 13c7d5816c
commit 1b9d87fa53
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/risotto/config.py
View File

@ -84,6 +84,10 @@ if 'TMP_DIR' in environ:
TMP_DIR = environ['TMP_DIR'] TMP_DIR = environ['TMP_DIR']
else: else:
TMP_DIR = config.get('TMP_DIR', '/tmp') 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): 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, 'submodule': {'allow_insecure_https': False,
'pki': '192.168.56.112'}, 'pki': '192.168.56.112'},
'provider': {'factory_configuration_filename': 'infra.json', 'provider': {'factory_configuration_filename': 'infra.json',
'packer_filename': 'recipe.json'}, 'packer_filename': 'recipe.json',
'risotto_images_dir': IMAGE_PATH},
} }