summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim MacArthur <jim.macarthur@codethink.co.uk>2015-01-21 18:08:01 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-01-27 14:57:04 +0000
commit6ad303e3bd3c2bb7ad0dd5670f62ebe99626afba (patch)
tree482a138d8f84c2f7a4fc91d6bbc9005df6c60750
parent1710aa1c5f4bc95695f5030c900d37174fe05ad7 (diff)
downloadmorph-6ad303e3bd3c2bb7ad0dd5670f62ebe99626afba.tar.gz
Remove checks for NETWORK_CONFIG and eth0 and eth1 in it
network_config isn't used anywhere in this function. The purpose of this function (getting the name of an appropriate host-only network interface) doesn't seem to depend on it either. eth0 and eth1 won't always be present (several Baserock systems will have enp0s3, etc). So I think these checks should be removed.
-rwxr-xr-xmorphlib/exts/virtualbox-ssh.write14
1 files changed, 0 insertions, 14 deletions
diff --git a/morphlib/exts/virtualbox-ssh.write b/morphlib/exts/virtualbox-ssh.write
index 1b4de89c..fa54c296 100755
--- a/morphlib/exts/virtualbox-ssh.write
+++ b/morphlib/exts/virtualbox-ssh.write
@@ -169,20 +169,6 @@ class VirtualBoxPlusSshWriteExtension(morphlib.writeexts.WriteExtension):
def get_host_interface(self, ssh_host):
host_ipaddr = os.environ.get('HOST_IPADDR')
netmask = os.environ.get('NETMASK')
- network_config = os.environ.get("NETWORK_CONFIG")
-
- if network_config is None:
- raise cliapp.AppException('NETWORK_CONFIG was not given')
-
- if "eth0:" not in network_config:
- raise cliapp.AppException(
- 'NETWORK_CONFIG does not contain '
- 'the eth0 configuration')
-
- if "eth1:" not in network_config:
- raise cliapp.AppException(
- 'NETWORK_CONFIG does not contain '
- 'the eth1 configuration')
if host_ipaddr is None:
raise cliapp.AppException('HOST_IPADDR was not given')