From 9e273c2d8fc52178ddf33efb197b0ea8a440a979 Mon Sep 17 00:00:00 2001 From: Blake Harnden Date: Tue, 2 Jul 2019 09:51:56 -0700 Subject: [PATCH] small tweaks to cleanup lxd from commented out code --- daemon/core/nodes/lxd.py | 7 +------ daemon/examples/lxd/lxd2core.py | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/daemon/core/nodes/lxd.py b/daemon/core/nodes/lxd.py index 5a36a1d9..f8ca377e 100644 --- a/daemon/core/nodes/lxd.py +++ b/daemon/core/nodes/lxd.py @@ -172,9 +172,7 @@ class LxcNode(CoreNode): def startup(self): """ - Start a new namespace node by invoking the vnoded process that - allocates a new namespace. Bring up the loopback device and set - the hostname. + Startup logic. :return: nothing """ @@ -209,7 +207,6 @@ class LxcNode(CoreNode): :return: exit status for command :rtype: int """ - # return self.client.ns_cmd(args, wait) return self.client.run_cmd(args, wait) def cmd_output(self, args): @@ -220,7 +217,6 @@ class LxcNode(CoreNode): :return: exit status and combined stdout and stderr :rtype: tuple[int, str] """ - # return self.client.ns_cmd_output(args) return self.client.run_cmd_output(args) def check_cmd(self, args): @@ -232,7 +228,6 @@ class LxcNode(CoreNode): :rtype: str :raises CoreCommandError: when a non-zero exit status occurs """ - # status, output = self.client.ns_cmd_output(args) status, output = self.client.run_cmd_output(args) if status: raise CoreCommandError(status, args, output) diff --git a/daemon/examples/lxd/lxd2core.py b/daemon/examples/lxd/lxd2core.py index 8a5c9990..69d4e1de 100644 --- a/daemon/examples/lxd/lxd2core.py +++ b/daemon/examples/lxd/lxd2core.py @@ -14,7 +14,6 @@ if __name__ == "__main__": try: prefixes = IpPrefixes(ip4_prefix="10.83.0.0/16") options = NodeOptions(image="ubuntu") - options.services = ["SSH"] # create node one node_one = session.add_node(_type=NodeTypes.LXC, node_options=options)