afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

small tweaks to cleanup lxd from commented out code

Browse source
This commit is contained in:
Blake Harnden 2019-07-02 09:51:56 -07:00
parent e83b38d96a
commit 9e273c2d8f
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
daemon/core/nodes/lxd.py
View file

@ -172,9 +172,7 @@ class LxcNode(CoreNode):
def startup(self): def startup(self):
""" """
Start a new namespace node by invoking the vnoded process that Startup logic.
allocates a new namespace. Bring up the loopback device and set
the hostname.
:return: nothing :return: nothing
""" """
@ -209,7 +207,6 @@ class LxcNode(CoreNode):
:return: exit status for command :return: exit status for command
:rtype: int :rtype: int
""" """
# return self.client.ns_cmd(args, wait)
return self.client.run_cmd(args, wait) return self.client.run_cmd(args, wait)
def cmd_output(self, args): def cmd_output(self, args):
@ -220,7 +217,6 @@ class LxcNode(CoreNode):
:return: exit status and combined stdout and stderr :return: exit status and combined stdout and stderr
:rtype: tuple[int, str] :rtype: tuple[int, str]
""" """
# return self.client.ns_cmd_output(args)
return self.client.run_cmd_output(args) return self.client.run_cmd_output(args)
def check_cmd(self, args): def check_cmd(self, args):
@ -232,7 +228,6 @@ class LxcNode(CoreNode):
:rtype: str :rtype: str
:raises CoreCommandError: when a non-zero exit status occurs :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) status, output = self.client.run_cmd_output(args)
if status: if status:
raise CoreCommandError(status, args, output) raise CoreCommandError(status, args, output)

1
daemon/examples/lxd/lxd2core.py
View file

@ -14,7 +14,6 @@ if __name__ == "__main__":
try: try:
prefixes = IpPrefixes(ip4_prefix="10.83.0.0/16") prefixes = IpPrefixes(ip4_prefix="10.83.0.0/16")
options = NodeOptions(image="ubuntu") options = NodeOptions(image="ubuntu")
options.services = ["SSH"]
# create node one # create node one
node_one = session.add_node(_type=NodeTypes.LXC, node_options=options) node_one = session.add_node(_type=NodeTypes.LXC, node_options=options)