From 2b1e59af8f6561e3a4f043ae25e974b06d6d0aa6 Mon Sep 17 00:00:00 2001 From: Firmlyzhu Date: Thu, 19 Jul 2018 14:40:26 +0800 Subject: [PATCH] Fix some bugs --- prepare.sh | 2 +- src/worker/worker.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/prepare.sh b/prepare.sh index 0025f5b..9c00643 100755 --- a/prepare.sh +++ b/prepare.sh @@ -16,7 +16,7 @@ fi # some packages' name maybe different in debian apt-get install -y cgmanager lxc lxcfs lxc-templates lvm2 bridge-utils curl exim4 openssh-server openvswitch-switch apt-get install -y python3 python3-netifaces python3-flask python3-flask-sqlalchemy python3-pampy python3-httplib2 python3-pip -apt-get install -y python3-psutil python3-flask-migrate +apt-get install -y python3-psutil python3-flask-migrate python3-paramiko apt-get install -y python3-lxc apt-get install -y python3-requests python3-suds apt-get install -y nodejs nodejs-legacy npm diff --git a/src/worker/worker.py b/src/worker/worker.py index 03da97a..88839c7 100755 --- a/src/worker/worker.py +++ b/src/worker/worker.py @@ -19,7 +19,6 @@ from socketserver import ThreadingMixIn import threading from utils import etcdlib, proxytool from worker import container, monitor -from worker.taskmgr import TaskMgr from utils.nettools import netcontrol,ovscontrol,portcontrol from utils.lvmtool import new_group, recover_group from master import network @@ -145,7 +144,6 @@ class Worker(object): self.rpcserver.register_function(proxytool.delete_route) self.rpcserver.register_function(portcontrol.acquire_port_mapping) self.rpcserver.register_function(portcontrol.release_port_mapping) - self.rpcserver.register_function(TaskMgr.execute_task) # register functions or instances to server for rpc #self.rpcserver.register_function(function_name)