diff --git a/.env-sample b/.env-sample index de3bcbe..fb4e5c8 100644 --- a/.env-sample +++ b/.env-sample @@ -12,8 +12,3 @@ VCENTER_HOST= VCENTER_PORT=443 VCENTER_USERNAME= VCENTER_PASSWORD= -VCENTER_CLUSTER= -VCENTER_DATASTORE= - -# Enter IP of ISC DHCP Server -DHCP_SERVER_IP= \ No newline at end of file diff --git a/deli_worker/main.py b/deli_worker/main.py index fdff9af..659e946 100644 --- a/deli_worker/main.py +++ b/deli_worker/main.py @@ -1,14 +1,11 @@ import sys -from ingredients_tasks.celary import Messaging, database +from ingredients_tasks.celary import Messaging def main(): messaging = Messaging('127.0.0.1', 5672, 'sandwich', 'hunter2', '/') messaging.connect() - database.connect() - # with database.session(): - # pass messaging.app.main = 'deli_worker' sys.argv.extend(['worker', '-l', 'info', '-Ofair']) messaging.start(argv=None) diff --git a/deli_worker/settings.py b/deli_worker/settings.py index 65f9b7f..0ba5915 100644 --- a/deli_worker/settings.py +++ b/deli_worker/settings.py @@ -37,18 +37,3 @@ VCENTER_PORT = os.environ['VCENTER_PORT'] VCENTER_USERNAME = os.environ['VCENTER_USERNAME'] VCENTER_PASSWORD = os.environ['VCENTER_PASSWORD'] - -VCENTER_IMAGES_FOLDER = 'images' -VCENTER_INSTANCES_FOLDER = 'instances' - -VCENTER_CLUSTER = os.environ['VCENTER_CLUSTER'] -VCENTER_DATASTORE = os.environ['VCENTER_DATASTORE'] - -#################### -# DHCP # -#################### - -DHCP_SERVER_IP = os.environ['DHCP_SERVER_IP'] -DHCP_OMAPI_PORT = os.environ.get('DHCP_OMAPI_PORT', 7911) -DHCP_KEY_NAME = os.environ.get('DHCP_KEY_NAME', None) -DHCP_B64_KEY = os.environ.get('DHCP_B64_KEY', None) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 1290152..d67e45a 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -1,4 +1,4 @@ #!/usr/bin/dumb-init /bin/bash -export SETTINGS_MODULE=deli_worker.settings +export settings=deli_worker.settings deli_worker $@ \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 9697d13..24cf311 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ -ingredients.tasks==0.0.1 # MIT \ No newline at end of file +ingredients.tasks==0.0.7 # MIT +ingredients.db==0.0.8 # MIT \ No newline at end of file