diff options
Diffstat (limited to 'cloudinit/net/ephemeral.py')
-rw-r--r-- | cloudinit/net/ephemeral.py | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/cloudinit/net/ephemeral.py b/cloudinit/net/ephemeral.py index 1dfde6e0..cade2e5f 100644 --- a/cloudinit/net/ephemeral.py +++ b/cloudinit/net/ephemeral.py @@ -107,22 +107,6 @@ class EphemeralIPv4Network: for cmd in self.cleanup_cmds: subp.subp(cmd, capture=True) - def _delete_address(self, address, prefix): - """Perform the ip command to remove the specified address.""" - subp.subp( - [ - "ip", - "-family", - "inet", - "addr", - "del", - "%s/%s" % (address, prefix), - "dev", - self.interface, - ], - capture=True, - ) - def _bringup_device(self): """Perform the ip comands to fully setup the device.""" cidr = "{0}/{1}".format(self.ip, self.prefix) @@ -315,14 +299,12 @@ class EphemeralDHCPv4: iface=None, connectivity_url_data: Optional[Dict[str, Any]] = None, dhcp_log_func=None, - tmp_dir=None, ): self.iface = iface self._ephipv4 = None self.lease = None self.dhcp_log_func = dhcp_log_func self.connectivity_url_data = connectivity_url_data - self.tmp_dir = tmp_dir def __enter__(self): """Setup sandboxed dhcp context, unless connectivity_url can already be @@ -360,9 +342,7 @@ class EphemeralDHCPv4: """ if self.lease: return self.lease - leases = maybe_perform_dhcp_discovery( - self.iface, self.dhcp_log_func, self.tmp_dir - ) + leases = maybe_perform_dhcp_discovery(self.iface, self.dhcp_log_func) if not leases: raise NoDHCPLeaseError() self.lease = leases[-1] @@ -426,23 +406,19 @@ class EphemeralIPNetwork: interface, ipv6: bool = False, ipv4: bool = True, - tmp_dir=None, ): self.interface = interface self.ipv4 = ipv4 self.ipv6 = ipv6 self.stack = contextlib.ExitStack() self.state_msg: str = "" - self.tmp_dir = tmp_dir def __enter__(self): # ipv6 dualstack might succeed when dhcp4 fails # therefore catch exception unless only v4 is used try: if self.ipv4: - self.stack.enter_context( - EphemeralDHCPv4(self.interface, tmp_dir=self.tmp_dir) - ) + self.stack.enter_context(EphemeralDHCPv4(self.interface)) if self.ipv6: self.stack.enter_context(EphemeralIPv6Network(self.interface)) # v6 link local might be usable |