m26508134
/
docklet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some bugs

This commit is contained in:
Firmlyzhu 2018-07-19 14:40:26 +08:00
parent 33f2b4a569
commit 2b1e59af8f
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prepare.sh
View File

@ -16,7 +16,7 @@ fi
# some packages' name maybe different in debian # 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 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 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-lxc
apt-get install -y python3-requests python3-suds apt-get install -y python3-requests python3-suds
apt-get install -y nodejs nodejs-legacy npm apt-get install -y nodejs nodejs-legacy npm

2
src/worker/worker.py
View File

@ -19,7 +19,6 @@ from socketserver import ThreadingMixIn
import threading import threading
from utils import etcdlib, proxytool from utils import etcdlib, proxytool
from worker import container, monitor from worker import container, monitor
from worker.taskmgr import TaskMgr
from utils.nettools import netcontrol,ovscontrol,portcontrol from utils.nettools import netcontrol,ovscontrol,portcontrol
from utils.lvmtool import new_group, recover_group from utils.lvmtool import new_group, recover_group
from master import network from master import network
@ -145,7 +144,6 @@ class Worker(object):
self.rpcserver.register_function(proxytool.delete_route) self.rpcserver.register_function(proxytool.delete_route)
self.rpcserver.register_function(portcontrol.acquire_port_mapping) self.rpcserver.register_function(portcontrol.acquire_port_mapping)
self.rpcserver.register_function(portcontrol.release_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 # register functions or instances to server for rpc
#self.rpcserver.register_function(function_name) #self.rpcserver.register_function(function_name)