diff options
| author | James Falcon <therealfalcon@gmail.com> | 2021-09-17 13:04:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-17 13:04:07 -0500 |
| commit | 612e39087aee3b1242765e7c4f463f54a6ebd723 (patch) | |
| tree | 27112d8462d1f414c61717a7500dc264ab96c2ac /cloudinit/sources/helpers | |
| parent | cb82a4508a4c56c3814fa633166d944762071bcf (diff) | |
| download | vyos-cloud-init-612e39087aee3b1242765e7c4f463f54a6ebd723.tar.gz vyos-cloud-init-612e39087aee3b1242765e7c4f463f54a6ebd723.zip | |
Add connectivity_url to Oracle's EphemeralDHCPv4 (#988)
Add connectivity_url to Oracle's EphemeralDHCPv4
On bionic, when trying to bring up the EphemeralDHCPv4, it's possible
that we already have a route defined, which will result in an error when
trying to add the DHCP route. Use the connectivity_url to check if we
can reach the metadata service, and if so, skip the EphemeralDHCPv4.
The has_url_connectivity function has also been modified to take
a dict of kwargs to send to readurl.
LP: #1939603
Diffstat (limited to 'cloudinit/sources/helpers')
| -rw-r--r-- | cloudinit/sources/helpers/vultr.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/sources/helpers/vultr.py b/cloudinit/sources/helpers/vultr.py index c22cd0b1..2521ec2f 100644 --- a/cloudinit/sources/helpers/vultr.py +++ b/cloudinit/sources/helpers/vultr.py @@ -20,7 +20,7 @@ LOG = log.getLogger(__name__) def get_metadata(url, timeout, retries, sec_between): # Bring up interface try: - with EphemeralDHCPv4(connectivity_url=url): + with EphemeralDHCPv4(connectivity_url_data={"url": url}): # Fetch the metadata v1 = read_metadata(url, timeout, retries, sec_between) except (NoDHCPLeaseError) as exc: |