Merge pull request #1 from sandwichcloud/update

update db and tasks

.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=

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)

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)

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 $@

requirements.txt

@@ -1 +1,2 @@
-ingredients.tasks==0.0.1 # MIT
+ingredients.tasks==0.0.7 # MIT
+ingredients.db==0.0.8 # MIT