removed bootsh from CoreNode types as it was not being used
This commit is contained in:
parent
56fbc0e3c5
commit
fe09b37819
3 changed files with 2 additions and 11 deletions
|
@ -491,7 +491,6 @@ class CoreNode(CoreNodeBase):
|
||||||
_id: int = None,
|
_id: int = None,
|
||||||
name: str = None,
|
name: str = None,
|
||||||
nodedir: str = None,
|
nodedir: str = None,
|
||||||
bootsh: str = "boot.sh",
|
|
||||||
start: bool = True,
|
start: bool = True,
|
||||||
server: "DistributedServer" = None,
|
server: "DistributedServer" = None,
|
||||||
) -> None:
|
) -> None:
|
||||||
|
@ -502,7 +501,6 @@ class CoreNode(CoreNodeBase):
|
||||||
:param _id: object id
|
:param _id: object id
|
||||||
:param name: object name
|
:param name: object name
|
||||||
:param nodedir: node directory
|
:param nodedir: node directory
|
||||||
:param bootsh: boot shell to use
|
|
||||||
:param start: start flag
|
:param start: start flag
|
||||||
:param server: remote server node
|
:param server: remote server node
|
||||||
will run on, default is None for localhost
|
will run on, default is None for localhost
|
||||||
|
@ -516,11 +514,8 @@ class CoreNode(CoreNodeBase):
|
||||||
self.pid = None
|
self.pid = None
|
||||||
self.lock = threading.RLock()
|
self.lock = threading.RLock()
|
||||||
self._mounts = []
|
self._mounts = []
|
||||||
self.bootsh = bootsh
|
|
||||||
|
|
||||||
use_ovs = session.options.get_config("ovs") == "True"
|
use_ovs = session.options.get_config("ovs") == "True"
|
||||||
self.node_net_client = self.create_node_net_client(use_ovs)
|
self.node_net_client = self.create_node_net_client(use_ovs)
|
||||||
|
|
||||||
if start:
|
if start:
|
||||||
self.startup()
|
self.startup()
|
||||||
|
|
||||||
|
|
|
@ -77,7 +77,6 @@ class DockerNode(CoreNode):
|
||||||
_id: int = None,
|
_id: int = None,
|
||||||
name: str = None,
|
name: str = None,
|
||||||
nodedir: str = None,
|
nodedir: str = None,
|
||||||
bootsh: str = "boot.sh",
|
|
||||||
start: bool = True,
|
start: bool = True,
|
||||||
server: DistributedServer = None,
|
server: DistributedServer = None,
|
||||||
image: str = None
|
image: str = None
|
||||||
|
@ -89,7 +88,6 @@ class DockerNode(CoreNode):
|
||||||
:param _id: object id
|
:param _id: object id
|
||||||
:param name: object name
|
:param name: object name
|
||||||
:param nodedir: node directory
|
:param nodedir: node directory
|
||||||
:param bootsh: boot shell to use
|
|
||||||
:param start: start flag
|
:param start: start flag
|
||||||
:param server: remote server node
|
:param server: remote server node
|
||||||
will run on, default is None for localhost
|
will run on, default is None for localhost
|
||||||
|
@ -98,7 +96,7 @@ class DockerNode(CoreNode):
|
||||||
if image is None:
|
if image is None:
|
||||||
image = "ubuntu"
|
image = "ubuntu"
|
||||||
self.image = image
|
self.image = image
|
||||||
super().__init__(session, _id, name, nodedir, bootsh, start, server)
|
super().__init__(session, _id, name, nodedir, start, server)
|
||||||
|
|
||||||
def create_node_net_client(self, use_ovs: bool) -> LinuxNetClient:
|
def create_node_net_client(self, use_ovs: bool) -> LinuxNetClient:
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -74,7 +74,6 @@ class LxcNode(CoreNode):
|
||||||
_id: int = None,
|
_id: int = None,
|
||||||
name: str = None,
|
name: str = None,
|
||||||
nodedir: str = None,
|
nodedir: str = None,
|
||||||
bootsh: str = "boot.sh",
|
|
||||||
start: bool = True,
|
start: bool = True,
|
||||||
server: DistributedServer = None,
|
server: DistributedServer = None,
|
||||||
image: str = None,
|
image: str = None,
|
||||||
|
@ -86,7 +85,6 @@ class LxcNode(CoreNode):
|
||||||
:param _id: object id
|
:param _id: object id
|
||||||
:param name: object name
|
:param name: object name
|
||||||
:param nodedir: node directory
|
:param nodedir: node directory
|
||||||
:param bootsh: boot shell to use
|
|
||||||
:param start: start flag
|
:param start: start flag
|
||||||
:param server: remote server node
|
:param server: remote server node
|
||||||
will run on, default is None for localhost
|
will run on, default is None for localhost
|
||||||
|
@ -95,7 +93,7 @@ class LxcNode(CoreNode):
|
||||||
if image is None:
|
if image is None:
|
||||||
image = "ubuntu"
|
image = "ubuntu"
|
||||||
self.image = image
|
self.image = image
|
||||||
super().__init__(session, _id, name, nodedir, bootsh, start, server)
|
super().__init__(session, _id, name, nodedir, start, server)
|
||||||
|
|
||||||
def alive(self) -> bool:
|
def alive(self) -> bool:
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Add table
Reference in a new issue