Compare commits

..

No commits in common. "1b9d87fa5370fdea7f83741a06bd473241c8e6ad" and "0e988d70409f53d411ff11ec1e5ddf30b2edf2a3" have entirely different histories.

1 changed files with 1 additions and 6 deletions

View File

@ -84,10 +84,6 @@ 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):
@ -116,8 +112,7 @@ _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',
'risotto_images_dir': IMAGE_PATH},
'packer_filename': 'recipe.json'},
}