diff --git a/daemon/core/nodes/base.py b/daemon/core/nodes/base.py index 71870cd9..74268129 100644 --- a/daemon/core/nodes/base.py +++ b/daemon/core/nodes/base.py @@ -491,7 +491,6 @@ class CoreNode(CoreNodeBase): _id: int = None, name: str = None, nodedir: str = None, - bootsh: str = "boot.sh", start: bool = True, server: "DistributedServer" = None, ) -> None: @@ -502,7 +501,6 @@ class CoreNode(CoreNodeBase): :param _id: object id :param name: object name :param nodedir: node directory - :param bootsh: boot shell to use :param start: start flag :param server: remote server node will run on, default is None for localhost @@ -516,11 +514,8 @@ class CoreNode(CoreNodeBase): self.pid = None self.lock = threading.RLock() self._mounts = [] - self.bootsh = bootsh - use_ovs = session.options.get_config("ovs") == "True" self.node_net_client = self.create_node_net_client(use_ovs) - if start: self.startup() diff --git a/daemon/core/nodes/docker.py b/daemon/core/nodes/docker.py index 4899b8f4..684e8452 100644 --- a/daemon/core/nodes/docker.py +++ b/daemon/core/nodes/docker.py @@ -77,7 +77,6 @@ class DockerNode(CoreNode): _id: int = None, name: str = None, nodedir: str = None, - bootsh: str = "boot.sh", start: bool = True, server: DistributedServer = None, image: str = None @@ -89,7 +88,6 @@ class DockerNode(CoreNode): :param _id: object id :param name: object name :param nodedir: node directory - :param bootsh: boot shell to use :param start: start flag :param server: remote server node will run on, default is None for localhost @@ -98,7 +96,7 @@ class DockerNode(CoreNode): if image is None: image = "ubuntu" 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: """ diff --git a/daemon/core/nodes/lxd.py b/daemon/core/nodes/lxd.py index 31623394..3b4c88c0 100644 --- a/daemon/core/nodes/lxd.py +++ b/daemon/core/nodes/lxd.py @@ -74,7 +74,6 @@ class LxcNode(CoreNode): _id: int = None, name: str = None, nodedir: str = None, - bootsh: str = "boot.sh", start: bool = True, server: DistributedServer = None, image: str = None, @@ -86,7 +85,6 @@ class LxcNode(CoreNode): :param _id: object id :param name: object name :param nodedir: node directory - :param bootsh: boot shell to use :param start: start flag :param server: remote server node will run on, default is None for localhost @@ -95,7 +93,7 @@ class LxcNode(CoreNode): if image is None: image = "ubuntu" self.image = image - super().__init__(session, _id, name, nodedir, bootsh, start, server) + super().__init__(session, _id, name, nodedir, start, server) def alive(self) -> bool: """