Skip to content

Commit

Permalink
update db and tasks
Browse files Browse the repository at this point in the history
  • Loading branch information
rmb938 committed Nov 19, 2017
1 parent 00cf38a commit 3f4856c
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 26 deletions.
5 changes: 0 additions & 5 deletions .env-sample
Original file line number Diff line number Diff line change
Expand Up @@ -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=
5 changes: 1 addition & 4 deletions deli_worker/main.py
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
15 changes: 0 additions & 15 deletions deli_worker/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/bash

export SETTINGS_MODULE=deli_worker.settings
export settings=deli_worker.settings
deli_worker $@
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
ingredients.tasks==0.0.1 # MIT
ingredients.tasks==0.0.7 # MIT
ingredients.db==0.0.8 # MIT

0 comments on commit 3f4856c

Please sign in to comment.