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
commit544ac8182471a0552b8a22fd574029e74a30d8ed (patch)
tree71869c3af5ac147273971096993f3541af420a9c
parent6a49bc67b3fc5073612195510d556129bfdd28bb (diff)
downloaddefinitions-544ac8182471a0552b8a22fd574029e74a30d8ed.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-xvirtualbox-ssh.write14
1 files changed, 0 insertions, 14 deletions
diff --git a/virtualbox-ssh.write b/virtualbox-ssh.write
index 1b4de89c..fa54c296 100755
--- a/virtualbox-ssh.write
+++ b/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')