diff --git a/src/risotto/config.py b/src/risotto/config.py index bacd6b3..f4176f3 100644 --- a/src/risotto/config.py +++ b/src/risotto/config.py @@ -20,10 +20,6 @@ if 'CONFIGURATION_DIR' in environ: CONFIGURATION_DIR = environ['CONFIGURATION_DIR'] else: CONFIGURATION_DIR = config.get('CONFIGURATION_DIR', '/srv/risotto/configurations') -if 'PROVIDER_FACTORY_CONFIG_DIR' in environ: - PROVIDER_FACTORY_CONFIG_DIR = environ['PROVIDER_FACTORY_CONFIG_DIR'] -else: - PROVIDER_FACTORY_CONFIG_DIR = config.get('PROVIDER_FACTORY_CONFIG_DIR', '/srv/factory') if 'DEFAULT_USER' in environ: DEFAULT_USER = environ['DEFAULT_USER'] else: @@ -52,6 +48,18 @@ if 'TIRAMISU_DB_USER' in environ: TIRAMISU_DB_USER = environ['TIRAMISU_DB_USER'] else: TIRAMISU_DB_USER = config.get('TIRAMISU_DB_USER', 'tiramisu') +if 'CELERYRISOTTO_DB_NAME' in environ: + CELERYRISOTTO_DB_NAME = environ['CELERYRISOTTO_DB_NAME'] +else: + CELERYRISOTTO_DB_NAME = config.get('CELERYRISOTTO_DB_NAME', None) +if 'CELERYRISOTTO_DB_PASSWORD' in environ: + CELERYRISOTTO_DB_PASSWORD = environ['CELERYRISOTTO_DB_PASSWORD'] +else: + CELERYRISOTTO_DB_PASSWORD = config.get('CELERYRISOTTO_DB_PASSWORD', None) +if 'CELERYRISOTTO_DB_USER' in environ: + CELERYRISOTTO_DB_USER = environ['CELERYRISOTTO_DB_USER'] +else: + CELERYRISOTTO_DB_USER = config.get('CELERYRISOTTO_DB_USER', None) if 'DB_ADDRESS' in environ: DB_ADDRESS = environ['DB_ADDRESS'] else: @@ -85,6 +93,7 @@ def dsn_factory(database, user, password, address=DB_ADDRESS): _config = {'database': {'dsn': dsn_factory(RISOTTO_DB_NAME, RISOTTO_DB_USER, RISOTTO_DB_PASSWORD), 'tiramisu_dsn': dsn_factory(TIRAMISU_DB_NAME, TIRAMISU_DB_USER, TIRAMISU_DB_PASSWORD), + 'celery_dsn': dsn_factory(CELERYRISOTTO_DB_NAME, CELERYRISOTTO_DB_USER, CELERYRISOTTO_DB_PASSWORD) }, 'http_server': {'port': RISOTTO_PORT, 'default_user': DEFAULT_USER}, @@ -102,8 +111,8 @@ _config = {'database': {'dsn': dsn_factory(RISOTTO_DB_NAME, RISOTTO_DB_USER, RIS 'internal_source': 'internal'}, 'submodule': {'allow_insecure_https': False, 'pki': '192.168.56.112'}, - 'provider': {'factory_configuration_dir': PROVIDER_FACTORY_CONFIG_DIR, - 'factory_configuration_filename': 'infra.json'}, + 'provider': {'factory_configuration_filename': 'infra.json', + 'packer_filename': 'recipe.json'}, } diff --git a/src/risotto/dispatcher.py b/src/risotto/dispatcher.py index bff2ff5..9f062e6 100644 --- a/src/risotto/dispatcher.py +++ b/src/risotto/dispatcher.py @@ -220,7 +220,6 @@ class PublishDispatcher: False, ) for function_obj in self.messages[version][message]['functions']: - print('======', function_obj['function'].__name__) async with self.pool.acquire() as connection: try: await self.check_message_type(risotto_context,